2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index b48066a64a7d..242a04104393 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -80,7 +80,7 @@
 #include <asm/serial.h>
 /* Standard COM flags */
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
 /*
 * SERIAL_PORT_DFNS tells us about built-in ports that have no
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index c903349bb40a..44f6bf79bbe1 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1471,7 +1471,7 @@ static struct sci_port sci_ports[] = {
                        .iotype         = UPIO_MEM,
                        .irq            = 61,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 0,
                },
                .type           = PORT_SCIF,
@@ -1485,7 +1485,7 @@ static struct sci_port sci_ports[] = {
                        .iotype         = UPIO_MEM,
                        .irq            = 62,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 1,
                },
                .type           = PORT_SCIF,
@@ -1499,7 +1499,7 @@ static struct sci_port sci_ports[] = {
                        .iotype         = UPIO_MEM,
                        .irq            = 63,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 2,
                },
                .type           = PORT_SCIF,
@@ -1514,7 +1514,7 @@ static struct sci_port sci_ports[] = {
                        .iotype         = UPIO_MEM,
                        .irq            = 43,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 0,
                },
                .type           = PORT_SCIF,
@@ -1528,7 +1528,7 @@ static struct sci_port sci_ports[] = {
                        .iotype         = UPIO_MEM,
                        .irq            = 79,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 1,
                },
                .type           = PORT_SCIF,

diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index b48066a64a7d..242a04104393 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c
@@ -80,7 +80,7 @@
80	#include <asm/serial.h>	80	#include <asm/serial.h>
81		81
82	/* Standard COM flags */	82	/* Standard COM flags */
83	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)	83	#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST)
84		84
85	/*	85	/*
86	* SERIAL_PORT_DFNS tells us about built-in ports that have no	86	* SERIAL_PORT_DFNS tells us about built-in ports that have no


diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index c903349bb40a..44f6bf79bbe1 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c
@@ -1471,7 +1471,7 @@ static struct sci_port sci_ports[] = {
1471	.iotype = UPIO_MEM,	1471	.iotype = UPIO_MEM,
1472	.irq = 61,	1472	.irq = 61,
1473	.ops = &sci_uart_ops,	1473	.ops = &sci_uart_ops,
1474	.flags = ASYNC_BOOT_AUTOCONF,	1474	.flags = UPF_BOOT_AUTOCONF,
1475	.line = 0,	1475	.line = 0,
1476	},	1476	},
1477	.type = PORT_SCIF,	1477	.type = PORT_SCIF,
@@ -1485,7 +1485,7 @@ static struct sci_port sci_ports[] = {
1485	.iotype = UPIO_MEM,	1485	.iotype = UPIO_MEM,
1486	.irq = 62,	1486	.irq = 62,
1487	.ops = &sci_uart_ops,	1487	.ops = &sci_uart_ops,
1488	.flags = ASYNC_BOOT_AUTOCONF,	1488	.flags = UPF_BOOT_AUTOCONF,
1489	.line = 1,	1489	.line = 1,
1490	},	1490	},
1491	.type = PORT_SCIF,	1491	.type = PORT_SCIF,
@@ -1499,7 +1499,7 @@ static struct sci_port sci_ports[] = {
1499	.iotype = UPIO_MEM,	1499	.iotype = UPIO_MEM,
1500	.irq = 63,	1500	.irq = 63,
1501	.ops = &sci_uart_ops,	1501	.ops = &sci_uart_ops,
1502	.flags = ASYNC_BOOT_AUTOCONF,	1502	.flags = UPF_BOOT_AUTOCONF,
1503	.line = 2,	1503	.line = 2,
1504	},	1504	},
1505	.type = PORT_SCIF,	1505	.type = PORT_SCIF,
@@ -1514,7 +1514,7 @@ static struct sci_port sci_ports[] = {
1514	.iotype = UPIO_MEM,	1514	.iotype = UPIO_MEM,
1515	.irq = 43,	1515	.irq = 43,
1516	.ops = &sci_uart_ops,	1516	.ops = &sci_uart_ops,
1517	.flags = ASYNC_BOOT_AUTOCONF,	1517	.flags = UPF_BOOT_AUTOCONF,
1518	.line = 0,	1518	.line = 0,
1519	},	1519	},
1520	.type = PORT_SCIF,	1520	.type = PORT_SCIF,
@@ -1528,7 +1528,7 @@ static struct sci_port sci_ports[] = {
1528	.iotype = UPIO_MEM,	1528	.iotype = UPIO_MEM,
1529	.irq = 79,	1529	.irq = 79,
1530	.ops = &sci_uart_ops,	1530	.ops = &sci_uart_ops,
1531	.flags = ASYNC_BOOT_AUTOCONF,	1531	.flags = UPF_BOOT_AUTOCONF,
1532	.line = 1,	1532	.line = 1,
1533	},	1533	},
1534	.type = PORT_SCIF,	1534	.type = PORT_SCIF,