Skip to content

Commit

Permalink
serial: fix compile warning about putc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Linus Torvalds committed Nov 5, 2007
1 parent ae5fbf7 commit bf2cdef
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/serial/8250_early.c
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit bf2cdef

Please sign in to comment.