1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c
index 8aa9bd65b45e..a592260fd673 100644
--- a/arch/mips/philips/pnx8550/common/platform.c
+++ b/arch/mips/philips/pnx8550/common/platform.c
@@ -66,28 +66,28 @@ struct ip3106_port ip3106_ports[] = {
        [0] = {
                .port   = {
                        .type           = PORT_IP3106,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .membase        = (void __iomem *)PNX8550_UART_PORT0,
                        .mapbase        = PNX8550_UART_PORT0,
                        .irq            = PNX8550_UART_INT(0),
                        .uartclk        = 3692300,
                        .fifosize       = 16,
                        .ops            = &ip3106_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 0,
                },
        },
        [1] = {
                .port   = {
                        .type           = PORT_IP3106,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .membase        = (void __iomem *)PNX8550_UART_PORT1,
                        .mapbase        = PNX8550_UART_PORT1,
                        .irq            = PNX8550_UART_INT(1),
                        .uartclk        = 3692300,
                        .fifosize       = 16,
                        .ops            = &ip3106_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 1,
                },
        },

diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c index 8aa9bd65b45e..a592260fd673 100644 --- a/arch/mips/philips/pnx8550/common/platform.c +++ b/arch/mips/philips/pnx8550/common/platform.c
@@ -66,28 +66,28 @@ struct ip3106_port ip3106_ports[] = {
66	[0] = {	66	[0] = {
67	.port = {	67	.port = {
68	.type = PORT_IP3106,	68	.type = PORT_IP3106,
69	.iotype = SERIAL_IO_MEM,	69	.iotype = UPIO_MEM,
70	.membase = (void __iomem *)PNX8550_UART_PORT0,	70	.membase = (void __iomem *)PNX8550_UART_PORT0,
71	.mapbase = PNX8550_UART_PORT0,	71	.mapbase = PNX8550_UART_PORT0,
72	.irq = PNX8550_UART_INT(0),	72	.irq = PNX8550_UART_INT(0),
73	.uartclk = 3692300,	73	.uartclk = 3692300,
74	.fifosize = 16,	74	.fifosize = 16,
75	.ops = &ip3106_pops,	75	.ops = &ip3106_pops,
76	.flags = ASYNC_BOOT_AUTOCONF,	76	.flags = UPF_BOOT_AUTOCONF,
77	.line = 0,	77	.line = 0,
78	},	78	},
79	},	79	},
80	[1] = {	80	[1] = {
81	.port = {	81	.port = {
82	.type = PORT_IP3106,	82	.type = PORT_IP3106,
83	.iotype = SERIAL_IO_MEM,	83	.iotype = UPIO_MEM,
84	.membase = (void __iomem *)PNX8550_UART_PORT1,	84	.membase = (void __iomem *)PNX8550_UART_PORT1,
85	.mapbase = PNX8550_UART_PORT1,	85	.mapbase = PNX8550_UART_PORT1,
86	.irq = PNX8550_UART_INT(1),	86	.irq = PNX8550_UART_INT(1),
87	.uartclk = 3692300,	87	.uartclk = 3692300,
88	.fifosize = 16,	88	.fifosize = 16,
89	.ops = &ip3106_pops,	89	.ops = &ip3106_pops,
90	.flags = ASYNC_BOOT_AUTOCONF,	90	.flags = UPF_BOOT_AUTOCONF,
91	.line = 1,	91	.line = 1,
92	},	92	},
93	},	93	},