diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-28 11:23:39 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-28 11:23:39 -0500 |
| commit | 728dd198aa543397c88f6f8e35f4f187b2bbc09d (patch) | |
| tree | d9f93149b69c3ece5849243a2836fbc511d3aae4 /drivers/tty/serial/pxa.c | |
| parent | e723e4429983333c6fbd3848de50333834d5e89c (diff) | |
| parent | 45e0f0f5684327a72866a34aedc3fcf8eec51889 (diff) | |
Merge branch 'earlycon-dt' into for-next
Diffstat (limited to 'drivers/tty/serial/pxa.c')
| -rw-r--r-- | drivers/tty/serial/pxa.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index f9f20f383760..9e7ee39f8b2a 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -711,13 +711,8 @@ static void serial_pxa_put_poll_char(struct uart_port *port, wait_for_xmitr(up); /* * Send the character out. - * If a LF, also do CR... */ serial_out(up, UART_TX, c); - if (c == 10) { - wait_for_xmitr(up); - serial_out(up, UART_TX, 13); - } /* * Finally, wait for transmitter to become empty |