Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Merge avlab serial board entries in parport_serial
  [SERIAL] kernel console should send CRLF not LFCR

1 files changed, 9 insertions, 17 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 7aca22c9976d..5996d3cd0ed8 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2182,6 +2182,14 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
         }
 }
 
+static void serial8250_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        wait_for_xmitr(up, UART_LSR_THRE);
+        serial_out(up, UART_TX, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -2193,7 +2201,6 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_8250_port *up = &serial8250_ports[co->index];
         unsigned int ier;
-        int i;
 
         touch_nmi_watchdog();
 
@@ -2207,22 +2214,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         else
                 serial_out(up, UART_IER, 0);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up, UART_LSR_THRE);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                serial_out(up, UART_TX, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up, UART_LSR_THRE);
-                        serial_out(up, UART_TX, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, serial8250_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty