diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 09:27:56 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 09:27:56 +0100 |
| commit | 41480ae7a383dcffa497decdd97b3cb2caaa18ec (patch) | |
| tree | f1e3afce2cbd0bbc544cd86a73e5b3093eb081c4 /drivers/serial | |
| parent | sh: Restrict old CMT timer code to SH-2/SH-2A. (diff) | |
| parent | serial: sh-sci: fix overrun error handling for SH7785 SCIF. (diff) | |
| download | linux-41480ae7a383dcffa497decdd97b3cb2caaa18ec.tar.xz linux-41480ae7a383dcffa497decdd97b3cb2caaa18ec.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 6 | ||||
| -rw-r--r-- | drivers/serial/sh-sci.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 3547558d2caf..324c74d2f666 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c @@ -161,6 +161,11 @@ static void jsm_tty_stop_rx(struct uart_port *port) channel->ch_bd->bd_ops->disable_receiver(channel); } +static void jsm_tty_enable_ms(struct uart_port *port) +{ + /* Nothing needed */ +} + static void jsm_tty_break(struct uart_port *port, int break_state) { unsigned long lock_flags; @@ -345,6 +350,7 @@ static struct uart_ops jsm_ops = { .start_tx = jsm_tty_start_tx, .send_xchar = jsm_tty_send_xchar, .stop_rx = jsm_tty_stop_rx, + .enable_ms = jsm_tty_enable_ms, .break_ctl = jsm_tty_break, .startup = jsm_tty_open, .shutdown = jsm_tty_close, diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 6a7cd498023d..bb9fe1224880 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -133,7 +133,7 @@ # define SCSPTR3 0xffed0024 /* 16 bit SCIF */ # define SCSPTR4 0xffee0024 /* 16 bit SCIF */ # define SCSPTR5 0xffef0024 /* 16 bit SCIF */ -# define SCIF_OPER 0x0001 /* Overrun error bit */ +# define SCIF_ORER 0x0001 /* Overrun error bit */ # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ #elif defined(CONFIG_CPU_SUBTYPE_SH7201) || \ defined(CONFIG_CPU_SUBTYPE_SH7203) || \ |