Merge branch 'master'

[linux-2.6-omap-h63xx.git] / drivers / serial / 8250_au1x00.c

diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
index 8d8d7a70d03e894629b888c7404fe24afeb9abf7..3d1bfd07208df18cd9634b870ca430a23077ce43 100644 (file)
--- 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),