linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c
index 58015fd..8d8d7a7 100644 (file)
--- a/drivers/serial/8250_au1x00.c
+++ b/drivers/serial/8250_au1x00.c
@@ -30,12 +30,13 @@
        {                                               \
                .iobase         = _base,                \
                .membase        = (void __iomem *)_base,\
-               .mapbase        = CPHYSADDR(_base),     \
+               .mapbase        = _base,                \
                .irq            = _irq,                 \
                .uartclk        = 0,    /* filled */    \
                .regshift       = 2,                    \
                .iotype         = UPIO_AU,              \
-               .flags          = UPF_SKIP_TEST         \
+               .flags          = UPF_SKIP_TEST |       \
+                                 UPF_IOREMAP,          \
        }
 
 static struct plat_serial8250_port au1x00_data[] = {
@@ -50,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),
-       /* The internal UART2 does not exist on the AU1100 processor. */
+       PORT(UART2_ADDR, AU1100_UART2_INT),
        PORT(UART3_ADDR, AU1100_UART3_INT),
 #elif defined(CONFIG_SOC_AU1550)
        PORT(UART0_ADDR, AU1550_UART0_INT),