diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:00:38 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:00:38 +0400 |
commit | 0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3 (patch) | |
tree | 6e0a8c2bbd33c1cec2af6fbb1a6665751c07a631 /include/asm-sh/bigsur/serial.h | |
parent | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (diff) | |
parent | 026d02a236f429eb61a1277166bd425f8514c431 (diff) | |
download | linux-0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/asm-sh/bigsur/serial.h')
-rw-r--r-- | include/asm-sh/bigsur/serial.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-sh/bigsur/serial.h b/include/asm-sh/bigsur/serial.h index 540f12205923..7233af42f755 100644 --- a/include/asm-sh/bigsur/serial.h +++ b/include/asm-sh/bigsur/serial.h @@ -14,13 +14,10 @@ #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) -#define STD_SERIAL_PORT_DEFNS \ +#define SERIAL_PORT_DFNS \ /* UART CLK PORT IRQ FLAGS */ \ { 0, BASE_BAUD, 0x3F8, HD64465_IRQ_UART, STD_COM_FLAGS } /* ttyS0 */ - -#define SERIAL_PORT_DFNS STD_SERIAL_PORT_DEFNS - /* XXX: This should be moved ino irq.h */ #define irq_cannonicalize(x) (x) |