diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/serial/8250_au1x00.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/serial/8250_au1x00.c')
| -rw-r--r-- | drivers/serial/8250_au1x00.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c index 8d8d7a70d03e..3d1bfd07208d 100644 --- a/drivers/serial/8250_au1x00.c +++ b/drivers/serial/8250_au1x00.c | |||
| @@ -51,7 +51,7 @@ static struct plat_serial8250_port au1x00_data[] = { | |||
| 51 | #elif defined(CONFIG_SOC_AU1100) | 51 | #elif defined(CONFIG_SOC_AU1100) |
| 52 | PORT(UART0_ADDR, AU1100_UART0_INT), | 52 | PORT(UART0_ADDR, AU1100_UART0_INT), |
| 53 | PORT(UART1_ADDR, AU1100_UART1_INT), | 53 | PORT(UART1_ADDR, AU1100_UART1_INT), |
| 54 | PORT(UART2_ADDR, AU1100_UART2_INT), | 54 | /* The internal UART2 does not exist on the AU1100 processor. */ |
| 55 | PORT(UART3_ADDR, AU1100_UART3_INT), | 55 | PORT(UART3_ADDR, AU1100_UART3_INT), |
| 56 | #elif defined(CONFIG_SOC_AU1550) | 56 | #elif defined(CONFIG_SOC_AU1550) |
| 57 | PORT(UART0_ADDR, AU1550_UART0_INT), | 57 | PORT(UART0_ADDR, AU1550_UART0_INT), |