ARM: OMAP: Fix merge conflicts manually

Fix merge conflicts manually

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index f8ad8b6f0d9fb301857f893a7e3c792f48ddcff0..3c304f374a34f00fe4771d1db26f200ced346905 100644 (file)
--- 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)