From 1aaafaaca4a931c0b10fffe75c6e22bcc99ffe9c Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 22 Dec 2008 03:40:10 +0900 Subject: [PATCH] --- yaml --- r: 120165 b: refs/heads/master c: b0c50ad71746c4ad148f366135e3c87e32729108 h: refs/heads/master i: 120163: a9a88b49b5c42cbfe75a62564365304995b21831 v: v3 --- [refs] | 2 +- trunk/drivers/serial/sh-sci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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))