From: Julia Lawall <julia@xxxxxxx> As in the commit 9b4a1617772d6d5ab5eeda0cd95302fae119e359, use UPIO_MEM rather than SERIAL_IO_MEM. Both have the same value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @has_sc@ @@ #include <linux/serial_core.h> @depends on has_sc@ @@ - SERIAL_IO_MEM + UPIO_MEM // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> --- arch/xtensa/platforms/s6105/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -u -p a/arch/xtensa/platforms/s6105/device.c b/arch/xtensa/platforms/s6105/device.c --- a/arch/xtensa/platforms/s6105/device.c +++ b/arch/xtensa/platforms/s6105/device.c @@ -54,7 +54,7 @@ static struct plat_serial8250_port seria .irq = UART_INTNUM, .uartclk = S6_SCLK, .regshift = 2, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST, }, { @@ -63,7 +63,7 @@ static struct plat_serial8250_port seria .irq = UART_INTNUM, .uartclk = S6_SCLK, .regshift = 2, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST, }, { }, -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
