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, 2 insertions, 7 deletions

diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 59ba5d993b4b..7e511199b4c5 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -74,7 +74,7 @@ static void __init wait_for_xmitr(struct uart_port *port)
         }
 }
 
-static void __init putc(struct uart_port *port, unsigned char c)
+static void __init putc(struct uart_port *port, int c)
 {
         wait_for_xmitr(port);
         serial_out(port, UART_TX, c);
@@ -89,12 +89,7 @@ static void __init early_uart_write(struct console *console, const char *s, unsi
         ier = serial_in(port, UART_IER);
         serial_out(port, UART_IER, 0);
 
-        while (*s && count-- > 0) {
-                putc(port, *s);
-                if (*s == '\n')
-                        putc(port, '\r');
-                s++;
-        }
+        uart_console_write(port, s, count, putc);
 
         /* Wait for transmitter to become empty and restore the IER */
         wait_for_xmitr(port);