From 43b140d543c8606177c41b46cd53e3426dcc3b31 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 15 Oct 2009 09:58:28 -0600
Subject: [PATCH] --- yaml --- r: 167878 b: refs/heads/master c:
 b7a8212cae06f3bfa810f941f455bd8bb9aa8528 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/serial/mpc52xx_uart.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 740654dda6d8..420c7575ac43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db467ebd1fb0ff17df30a78d87c6cda4ea7b21c2
+refs/heads/master: b7a8212cae06f3bfa810f941f455bd8bb9aa8528
diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c
index d7bcd074d383..7ce9e9f567a3 100644
--- a/trunk/drivers/serial/mpc52xx_uart.c
+++ b/trunk/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))