aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-10-28 09:56:18 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-10-28 09:56:18 +1100
commit40578fca24e7f777f3da7a693b030ae28ef7e486 (patch)
treeed0541f857882f647bfc97e03d83371b8f4698a6 /drivers/serial
parent4f917ba3d5ee9c98d60fa357e799942df8412de3 (diff)
parent4bdf0bb7d64cf672199519b3d808e2a82f5b59e9 (diff)
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/mpc52xx_uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index d7bcd074d38..7ce9e9f567a 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))