diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /include/asm-mips/mach-au1x00/au1000.h | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
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 */ |