From e176ed0fa84626aa47362016c06bd6f0c073af41 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 13 Feb 2006 09:50:03 -0800 Subject: [PATCH] ARM: OMAP: Fix merge conflicts manually Fix merge conflicts manually --- drivers/serial/8250.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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) -- 2.41.3