The following commit has been merged in the linux branch: commit b7a8212cae06f3bfa810f941f455bd8bb9aa8528 Author: Julia Lawall julia@diku.dk Date: Thu Oct 15 09:58:28 2009 -0600

drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM

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@diku.dk Signed-off-by: Grant Likely grant.likely@secretlab.ca

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index d7bcd07..7ce9e9f 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -705,7 +705,7 @@ mpc52xx_uart_verify_port(struct uart_port *port, struct serial_struct *ser) return -EINVAL;

if ((ser->irq != port->irq) || - (ser->io_type != SERIAL_IO_MEM) || + (ser->io_type != UPIO_MEM) || (ser->baud_base != port->uartclk) || (ser->iomem_base != (void *)port->mapbase) || (ser->hub6 != 0))