diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 10:58:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 10:58:04 +1000 |
| commit | f63fa3659a764fec6a7d500ad9da5122b5237aee (patch) | |
| tree | 5065f9c57536d5e39d2237894c70aedeeb84750e /include/linux | |
| parent | f68abdb402f76bd312ca6a72b9d39ff8d4c64371 (diff) | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
Merge remote branch 'genesis/master'
Conflicts:
include/linux/serial_sci.h
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index f10db6e5f3b5..522832023a69 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -186,6 +186,9 @@ #define PORT_ALTERA_JTAGUART 91 #define PORT_ALTERA_UART 92 +/* SH-SCI */ +#define PORT_SCIFB 93 + #ifdef __KERNEL__ #include <linux/compiler.h> |