From: Paul Mundt Date: Wed, 17 Dec 2008 05:53:24 +0000 (+0900) Subject: serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL. X-Git-Tag: v2.6.29-rc1~591^2~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1f6fd5c916c8416588f5797e7837b9e81b3251a5;p=linux-2.6-omap-h63xx.git serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL. sci_poll_put_char() happens to also be used by the serial console, while sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL. Add another gnarly ifdef to shut up the compiler. Signed-off-by: Paul Mundt --- diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index cf663b71869..a628081e586 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -99,6 +99,8 @@ to_sci_port(struct uart_port *uart) } #if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_SH_SCI_CONSOLE) + +#ifdef CONFIG_CONSOLE_POLL static inline void handle_error(struct uart_port *port) { /* Clear error flags */ @@ -126,6 +128,7 @@ static int sci_poll_get_char(struct uart_port *port) return c; } +#endif static void sci_poll_put_char(struct uart_port *port, unsigned char c) {