diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 07:48:00 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-20 07:48:32 +0400 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /include/linux/serial.h | |
| parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
| parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
| download | linux-c88739b373e4930ed082a607cb78bf82616fd076.tar.xz | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'include/linux/serial.h')
| -rw-r--r-- | include/linux/serial.h | 3 |
1 files changed, 1 insertions, 2 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 |