From d17a5dfca8e931a66664c4cfb868f5ab91e1bb64 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 10 Sep 2012 22:31:04 -0700
Subject: [PATCH] --- yaml --- r: 325756 b: refs/heads/master c:
 cdd86b277dc82220aa630414896505517a02a201 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 91a3de71890b..a44479135de5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81732c3b2fede049a692e58a7ceabb6d18ffb18c
+refs/heads/master: cdd86b277dc82220aa630414896505517a02a201
diff --git a/trunk/drivers/tty/serial/8250/8250.c b/trunk/drivers/tty/serial/8250/8250.c
index 44f52c6f15b9..d4e0b07cb130 100644
--- a/trunk/drivers/tty/serial/8250/8250.c
+++ b/trunk/drivers/tty/serial/8250/8250.c
@@ -2340,7 +2340,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
 			serial_port_out(port, UART_EFR, efr);
 	}
 
-#ifdef CONFIG_ARCH_OMAP
+#ifdef CONFIG_ARCH_OMAP1
 	/* Workaround to enable 115200 baud on OMAP1510 internal ports */
 	if (cpu_is_omap1510() && is_omap_port(up)) {
 		if (baud == 115200) {
@@ -2430,7 +2430,7 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt)
 {
 	if (pt->port.iotype == UPIO_AU)
 		return 0x1000;
-#ifdef CONFIG_ARCH_OMAP
+#ifdef CONFIG_ARCH_OMAP1
 	if (is_omap_port(pt))
 		return 0x16 << pt->port.regshift;
 #endif