aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-12-17 00:53:24 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 04:44:46 -0500
commit1f6fd5c916c8416588f5797e7837b9e81b3251a5 (patch)
tree1793bda2b303c2b071c3dc68ef25aacc2e44811c /drivers/serial
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>
Diffstat (limited to 'drivers/serial')
-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 cf663b718697..a628081e586e 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -99,6 +99,8 @@ to_sci_port(struct uart_port *uart)
99} 99}
100 100
101#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_SH_SCI_CONSOLE) 101#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
102
103#ifdef CONFIG_CONSOLE_POLL
102static inline void handle_error(struct uart_port *port) 104static inline void handle_error(struct uart_port *port)
103{ 105{
104 /* Clear error flags */ 106 /* Clear error flags */
@@ -126,6 +128,7 @@ static int sci_poll_get_char(struct uart_port *port)
126 128
127 return c; 129 return c;
128} 130}
131#endif
129 132
130static void sci_poll_put_char(struct uart_port *port, unsigned char c) 133static void sci_poll_put_char(struct uart_port *port, unsigned char c)
131{ 134{