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/sh-sci.h | |
| 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/sh-sci.h')
| -rw-r--r-- | drivers/serial/sh-sci.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) || \ |