Merge by Hand

[linux-2.6] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 2b0401b93f2b81ae8d0ff52e4a42b67336452c7a..9d257923068924cf8e385e9b3127c7b12835b482 100644 (file)
--- 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__