diff options
| author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2007-11-05 14:50:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 15:12:32 -0800 |
| commit | bf2cdef30667d0d3d09c6934c95d1fb87c43345a (patch) | |
| tree | 234778fcf329fdd7ff07a789b4fe7c51ec7fd29c /drivers/serial/8250_early.c | |
| parent | ae5fbf771aeb534e31f3541673bb240ff8c07283 (diff) | |
| download | blackbird-op-linux-bf2cdef30667d0d3d09c6934c95d1fb87c43345a.tar.gz blackbird-op-linux-bf2cdef30667d0d3d09c6934c95d1fb87c43345a.zip | |
serial: fix compile warning about putc
drivers/serial/8250_early.c:80: warning: conflicting types for built-in function `putc'
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial/8250_early.c')
| -rw-r--r-- | drivers/serial/8250_early.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c index 4d4c9f01be8d..1f16de719962 100644 --- a/drivers/serial/8250_early.c +++ b/drivers/serial/8250_early.c @@ -76,7 +76,7 @@ static void __init wait_for_xmitr(struct uart_port *port) } } -static void __init putc(struct uart_port *port, int c) +static void __init serial_putc(struct uart_port *port, int c) { wait_for_xmitr(port); serial_out(port, UART_TX, c); @@ -91,7 +91,7 @@ static void __init early_serial8250_write(struct console *console, const char *s ier = serial_in(port, UART_IER); serial_out(port, UART_IER, 0); - uart_console_write(port, s, count, putc); + uart_console_write(port, s, count, serial_putc); /* Wait for transmitter to become empty and restore the IER */ wait_for_xmitr(port); |
