diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-10-31 13:53:26 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-31 13:53:26 +0000 |
| commit | 913ade51eca369553a8ffbdaf1f426fade84f6ae (patch) | |
| tree | a692ada4da2b0031d7ba941f987c9d8dd7f4e0b1 | |
| parent | 6a8f8d72bd2fe9964ee10c0f58b14d6370e49769 (diff) | |
| download | linux-913ade51eca369553a8ffbdaf1f426fade84f6ae.tar.gz | |
[SERIAL] Fix port numbering
The PORT_* macros must be uniquely numbered. This fixes the definitions. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | include/linux/serial_core.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 2b0401b93f2b..9d2579230689 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -39,8 +39,7 @@ #define PORT_RSA 13 #define PORT_NS16550A 14 #define PORT_XSCALE 15 -#define PORT_IP3106 16 -#define PORT_MAX_8250 16 /* max port ID */ +#define PORT_MAX_8250 15 /* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed @@ -118,7 +117,9 @@ #define PORT_M32R_SIO 68 /*Digi jsm */ -#define PORT_JSM 65 +#define PORT_JSM 69 + +#define PORT_IP3106 70 #ifdef __KERNEL__ |