diff --git a/[refs] b/[refs]
index f673eb3afc76..b9a3f2f72123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a8f8d72bd2fe9964ee10c0f58b14d6370e49769
+refs/heads/master: 913ade51eca369553a8ffbdaf1f426fade84f6ae
diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h
index 2b0401b93f2b..9d2579230689 100644
--- a/trunk/include/linux/serial_core.h
+++ b/trunk/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__