diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
| commit | 9d8f057acbd38d8177cf2ffd5e151d52c2477372 (patch) | |
| tree | 1c3387b045a8a487ff99bf3abed1cdf41670f6e6 /drivers/serial/sunsab.c | |
| parent | 591eb85ecd7e6eb8596c6129ae074e16636b99f4 (diff) | |
| parent | 91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06 (diff) | |
| download | op-kernel-dev-9d8f057acbd38d8177cf2ffd5e151d52c2477372.zip op-kernel-dev-9d8f057acbd38d8177cf2ffd5e151d52c2477372.tar.gz | |
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
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index a2fb0c2..bfbe9dc 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -861,8 +861,9 @@ static int num_channels; #ifdef CONFIG_SERIAL_SUNSAB_CONSOLE -static __inline__ void sunsab_console_putchar(struct uart_sunsab_port *up, char c) +static void sunsab_console_putchar(struct uart_port *port, int c) { + struct uart_sunsab_port *up = (struct uart_sunsab_port *)port; unsigned long flags; spin_lock_irqsave(&up->port.lock, flags); @@ -876,13 +877,8 @@ static __inline__ void sunsab_console_putchar(struct uart_sunsab_port *up, char static void sunsab_console_write(struct console *con, const char *s, unsigned n) { struct uart_sunsab_port *up = &sunsab_ports[con->index]; - int i; - for (i = 0; i < n; i++) { - if (*s == '\n') - sunsab_console_putchar(up, '\r'); - sunsab_console_putchar(up, *s++); - } + uart_console_write(&up->port, s, n, sunsab_console_putchar); sunsab_tec_wait(up); } |
