aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-12-17 14:53:24 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 18:44:46 +0900
commit1f6fd5c916c8416588f5797e7837b9e81b3251a5 (patch)
tree1793bda2b303c2b071c3dc68ef25aacc2e44811c
parent073da9c0de401e8683b6bc76c008a7e0850045d5 (diff)
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 <lethal@linux-sh.org>
-rw-r--r--drivers/serial/sh-sci.c3
1 files changed, 3 insertions, 0 deletions
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)
{