diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 12:48:28 +0100 |
| commit | 645af4e9e0e32481e3336dda813688732c7e5f0f (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /drivers/serial | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
| parent | 55f2b78995826d549401bdf20abeac1832636bb6 (diff) | |
Merge branch 'x86/pat' into x86/core
Diffstat (limited to 'drivers/serial')
| -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 3599828b976..022e89ffec1 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) || \ |