[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>
git-mirror · Oct 31, 2005 · 913ade5 · 913ade5
1 parent 6a8f8d7
commit 913ade5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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__