diff --git a/[refs] b/[refs]
index d08c0e089212..72554477e7f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073da9c0de401e8683b6bc76c008a7e0850045d5
+refs/heads/master: 1f6fd5c916c8416588f5797e7837b9e81b3251a5
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
index cf663b718697..a628081e586e 100644
--- a/trunk/drivers/serial/sh-sci.c
+++ b/trunk/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)
 {