From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Feb 2006 17:50:03 +0000 (-0800)
Subject: ARM: OMAP: Fix merge conflicts manually
X-Git-Tag: v2.6.16-omap1~63^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e176ed0fa84626aa47362016c06bd6f0c073af41;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix merge conflicts manually

Fix merge conflicts manually
---

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f8ad8b6f0d9..3c304f374a3 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2246,10 +2246,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 	 *	and restore the IER
 	 */
 	wait_for_xmitr(up, BOTH_EMPTY);
-	/* FIXME: This causes "too much work" on omap
-	 * commit f91a3715db2bb44fcf08cec642e68f919b70f7f4 */
-	//serial_out(up, UART_IER, ier | UART_IER_THRI);
-	serial_out(up, UART_IER, ier);
+	up->ier |= UART_IER_THRI;
+	serial_out(up, UART_IER, ier | UART_IER_THRI);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)