diff --git a/[refs] b/[refs]
index fe695e11d771..385551b788f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f5cd2bd59c3bbaf073a7a52fcdefded939bd306
+refs/heads/master: b0c50ad71746c4ad148f366135e3c87e32729108
diff --git a/trunk/drivers/serial/sh-sci.c b/trunk/drivers/serial/sh-sci.c
index a628081e586e..557b54ab2f25 100644
--- a/trunk/drivers/serial/sh-sci.c
+++ b/trunk/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))