From a640c5332414bbb28fd56b6e74040f56bbfa81fd Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Jan 2006 18:09:44 +0000
Subject: [PATCH] --- yaml --- r: 16731 b: refs/heads/master c:
 1624f003349b49050f42c7d9f5407dfc05efb912 h: refs/heads/master i:   16729:
 a953376137a497947612de44b8e4314e9e68ef47   16727:
 a96bf40e7aeb50acffcccad3ffd31909d46fc1ce v: v3

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

diff --git a/[refs] b/[refs]
index 36201d6d1efa..a2d4dd7d2b30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26e92861be9c0da3be30718de693976b3f6a8026
+refs/heads/master: 1624f003349b49050f42c7d9f5407dfc05efb912
diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c
index c17d680e3f04..34c576dfad8d 100644
--- a/trunk/drivers/serial/serial_core.c
+++ b/trunk/drivers/serial/serial_core.c
@@ -2307,7 +2307,7 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2)
 		return (port1->iobase == port2->iobase) &&
 		       (port1->hub6   == port2->hub6);
 	case UPIO_MEM:
-		return (port1->membase == port2->membase);
+		return (port1->mapbase == port2->mapbase);
 	}
 	return 0;
 }