diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:04:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:04:09 -0700 |
| commit | 608a5ffc3ee0d6f4aff53e902659201eeaeb9c06 (patch) | |
| tree | 38658ba63eb2fccaf9f3d23112c84a31a40e257f /include | |
| parent | 78f220a84f464ff1a74d1b646e9b96bdddc47050 (diff) | |
| parent | 6eb68d6f3bf1707d5d816ea9242b7d38f25b942e (diff) | |
| download | linux-608a5ffc3ee0d6f4aff53e902659201eeaeb9c06.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver
serial: bfin_sport_uart: restore transmit frame sync fix
serial: fix port type conflict between NS16550A & U6_16550A
MAINTAINERS: orphan isicom
vt: Fix console corruption on driver hand-over.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial.h | 3 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index 1ebc694a6d52..ef914061511e 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -77,8 +77,7 @@ struct serial_struct { #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 /* RSA-DV II/S card */ -#define PORT_U6_16550A 14 -#define PORT_MAX 14 +#define PORT_MAX 13 #define SERIAL_IO_PORT 0 #define SERIAL_IO_HUB6 1 diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 64458a9a8938..563e23400913 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -44,7 +44,8 @@ #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */ #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */ #define PORT_AR7 18 /* Texas Instruments AR7 internal UART */ -#define PORT_MAX_8250 18 /* max port ID */ +#define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */ +#define PORT_MAX_8250 19 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed |