From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 31 Oct 2005 13:53:26 +0000 (+0000)
Subject: [SERIAL] Fix port numbering
X-Git-Tag: v2.6.15-rc1~18^2~32^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=913ade51eca369553a8ffbdaf1f426fade84f6ae;p=linux-2.6

[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>
---

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 2b0401b93f..9d25792306 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__