diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 13:10:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 13:10:09 -0500 |
| commit | e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4 (patch) | |
| tree | 0515ffe68d9a88eda2d16f45e6391b05475fd9d1 /include/asm-mips/mach-au1x00/au1000.h | |
| parent | e1a8e6c9b757c09249ab29fc6da12d9ab64567e1 (diff) | |
| parent | b38c73995f63fe205c0068cb0ce3131895244068 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/mach-au1x00/au1000.h')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 8e1d7ed7d8e3..4686e17c206c 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -1198,7 +1198,11 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]; | |||
| 1198 | 1198 | ||
| 1199 | /* UARTS 0-3 */ | 1199 | /* UARTS 0-3 */ |
| 1200 | #define UART_BASE UART0_ADDR | 1200 | #define UART_BASE UART0_ADDR |
| 1201 | #ifdef CONFIG_SOC_AU1200 | ||
| 1202 | #define UART_DEBUG_BASE UART1_ADDR | ||
| 1203 | #else | ||
| 1201 | #define UART_DEBUG_BASE UART3_ADDR | 1204 | #define UART_DEBUG_BASE UART3_ADDR |
| 1205 | #endif | ||
| 1202 | 1206 | ||
| 1203 | #define UART_RX 0 /* Receive buffer */ | 1207 | #define UART_RX 0 /* Receive buffer */ |
| 1204 | #define UART_TX 4 /* Transmit buffer */ | 1208 | #define UART_TX 4 /* Transmit buffer */ |