---

yaml --- r: 120165 b: refs/heads/master c: b0c50ad h: refs/heads/master i: 120163: a9a88b4 v: v3
git-mirror · Dec 22, 2008 · 1aaafaa · 1aaafaa
1 parent 83516c2
commit 1aaafaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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))