diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 09:48:36 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 09:48:36 -0400 |
| commit | 78b425faafb1d36d7759a7d799e1c60671670532 (patch) | |
| tree | 76b84543fcaf78ec880aec6828b83e1c50478082 /include/linux | |
| parent | dfd3b596fbbfa48b8e7966ef996d587157554b69 (diff) | |
| parent | 3af1f8a41feab47b232b0c3d3b2322426672480d (diff) | |
Merge branches 'sh/core' and 'sh/serial-rework' into sh-fixes-for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_sci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 8bffe9ae2ca..5f3939c67dd 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h | |||
| @@ -67,6 +67,7 @@ enum { | |||
| 67 | SCIx_IRDA_REGTYPE, | 67 | SCIx_IRDA_REGTYPE, |
| 68 | SCIx_SCIFA_REGTYPE, | 68 | SCIx_SCIFA_REGTYPE, |
| 69 | SCIx_SCIFB_REGTYPE, | 69 | SCIx_SCIFB_REGTYPE, |
| 70 | SCIx_SH2_SCIF_FIFODATA_REGTYPE, | ||
| 70 | SCIx_SH3_SCIF_REGTYPE, | 71 | SCIx_SH3_SCIF_REGTYPE, |
| 71 | SCIx_SH4_SCIF_REGTYPE, | 72 | SCIx_SH4_SCIF_REGTYPE, |
| 72 | SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, | 73 | SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, |