aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250_au1x00.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-29 13:24:50 +1100
committerPaul Mackerras <paulus@samba.org>2006-03-29 13:24:50 +1100
commitbac30d1a78d0f11c613968fc8b351a91ed465386 (patch)
treee52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/serial/8250_au1x00.c
parente8222502ee6157e2713da9e0792c21f4ad458d50 (diff)
parentca9ba4471c1203bb6e759b76e83167fec54fe590 (diff)
downloadkernel_samsung_smdk4412-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.gz
kernel_samsung_smdk4412-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.bz2
kernel_samsung_smdk4412-bac30d1a78d0f11c613968fc8b351a91ed465386.zip
Merge ../linux-2.6
Diffstat (limited to 'drivers/serial/8250_au1x00.c')
-rw-r--r--drivers/serial/8250_au1x00.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
index 8d8d7a70d03..3d1bfd07208 100644
--- a/drivers/serial/8250_au1x00.c
+++ b/drivers/serial/8250_au1x00.c
@@ -51,7 +51,7 @@ static struct plat_serial8250_port au1x00_data[] = {
#elif defined(CONFIG_SOC_AU1100)
PORT(UART0_ADDR, AU1100_UART0_INT),
PORT(UART1_ADDR, AU1100_UART1_INT),
- PORT(UART2_ADDR, AU1100_UART2_INT),
+ /* The internal UART2 does not exist on the AU1100 processor. */
PORT(UART3_ADDR, AU1100_UART3_INT),
#elif defined(CONFIG_SOC_AU1550)
PORT(UART0_ADDR, AU1550_UART0_INT),