Skip to content

L
linux-davinci
Commit e176ed0f authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

ARM: OMAP: Fix merge conflicts manually 

Fix merge conflicts manually
parent f4927cc2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
drivers/serial/8250.c
View file @ e176ed0f
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment