Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-omap-h63xx.git] / drivers / serial / sh-sci.c

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index cf663b718697bc5578015654f2ac985051e0176e..557b54ab2f25d22b0f623b7f6dde18cb12cc47f2 100644 (file)
--- 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)
 {
@@ -266,7 +269,7 @@ static inline void sci_init_pins(struct uart_port *port, unsigned int cflag)
        if (!(cflag & CRTSCTS))
                __raw_writew(0x0080, SCSPTR0); /* Set RTS = 1 */
 }
-#elif defined(CONFIG_CPU_SH4)
+#elif defined(CONFIG_CPU_SH4) && !defined(CONFIG_CPU_SH4A)
 static inline void sci_init_pins(struct uart_port *port, unsigned int cflag)
 {
        if (!(cflag & CRTSCTS))