diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /include/asm-mips/mach-au1x00 | |
| parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
| parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-mips/mach-au1x00')
| -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 */ |