diff options
author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2007-11-05 17:50:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 18:12:32 -0500 |
commit | bf2cdef30667d0d3d09c6934c95d1fb87c43345a (patch) | |
tree | 234778fcf329fdd7ff07a789b4fe7c51ec7fd29c /drivers/serial | |
parent | ae5fbf771aeb534e31f3541673bb240ff8c07283 (diff) |
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')
-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) | |||
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
79 | static void __init putc(struct uart_port *port, int c) | 79 | static void __init serial_putc(struct uart_port *port, int c) |
80 | { | 80 | { |
81 | wait_for_xmitr(port); | 81 | wait_for_xmitr(port); |
82 | serial_out(port, UART_TX, c); | 82 | serial_out(port, UART_TX, c); |
@@ -91,7 +91,7 @@ static void __init early_serial8250_write(struct console *console, const char *s | |||
91 | ier = serial_in(port, UART_IER); | 91 | ier = serial_in(port, UART_IER); |
92 | serial_out(port, UART_IER, 0); | 92 | serial_out(port, UART_IER, 0); |
93 | 93 | ||
94 | uart_console_write(port, s, count, putc); | 94 | uart_console_write(port, s, count, serial_putc); |
95 | 95 | ||
96 | /* Wait for transmitter to become empty and restore the IER */ | 96 | /* Wait for transmitter to become empty and restore the IER */ |
97 | wait_for_xmitr(port); | 97 | wait_for_xmitr(port); |