diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 18:29:27 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 18:29:27 +0900 |
| commit | 70876facfa9bb6596e4c09e9ed6b8f26d0bcba51 (patch) | |
| tree | 05ebd850c3061a5e923d1ee8ef6c72b68805983b /drivers/serial/sh-sci.c | |
| parent | b2309d684078f2be1d5db6ceabc99c51f9af3b6b (diff) | |
| parent | 2b1bd1ac5d4bffe3fd542bfe1784a583bd7df4fa (diff) | |
Merge branch 'x3'
Diffstat (limited to 'drivers/serial/sh-sci.c')
| -rw-r--r-- | drivers/serial/sh-sci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 1f89496d530..672cd104253 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -367,7 +367,9 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag) } else { #ifdef CONFIG_CPU_SUBTYPE_SH7343 /* Nothing */ -#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785) +#elif defined(CONFIG_CPU_SUBTYPE_SH7780) || \ + defined(CONFIG_CPU_SUBTYPE_SH7785) || \ + defined(CONFIG_CPU_SUBTYPE_SHX3) ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */ #else ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */ |