Merge branch 'devel'

[mv-sheeva.git] / drivers / serial / sh-sci.c

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a628081e586e33b1fc90ed0e9802c8bce244efdf..557b54ab2f25d22b0f623b7f6dde18cb12cc47f2 100644 (file)
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -269,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))