diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-20 14:22:54 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-20 14:22:54 -0500 |
| commit | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (patch) | |
| tree | e01eaf5fcfed6767da9fcfd8f5120ef667c81bb8 /drivers/tty/serial/serial_txx9.c | |
| parent | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (diff) | |
| parent | e26f1db9b8d74617519e50b41749900d0a257406 (diff) | |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next
Conflicts:
arch/arm64/kernel/early_printk.c
Diffstat (limited to 'drivers/tty/serial/serial_txx9.c')
| -rw-r--r-- | drivers/tty/serial/serial_txx9.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c index 90a080b1f9ee..60f49b9d7e39 100644 --- a/drivers/tty/serial/serial_txx9.c +++ b/drivers/tty/serial/serial_txx9.c @@ -535,13 +535,8 @@ static void serial_txx9_put_poll_char(struct uart_port *port, unsigned char c) wait_for_xmitr(up); /* * Send the character out. - * If a LF, also do CR... */ sio_out(up, TXX9_SITFIFO, c); - if (c == 10) { - wait_for_xmitr(up); - sio_out(up, TXX9_SITFIFO, 13); - } /* * Finally, wait for transmitter to become empty |