diff options
author | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
commit | 4a445f291ac3faa08f56eaeb6e44856b6b72b74c (patch) | |
tree | b66cc93311dc4c623113a87aa9b40730a21ac18e /include/linux/serial.h | |
parent | cbc60ca04b342a4e1f2a1086a7277c077f07dbed (diff) | |
parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
download | kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.zip kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.gz kernel_samsung_smdk4412-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.bz2 |
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
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 1ebc694..ef91406 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 |