Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 7f2c99d66e9d697203a72ec4f965459495f4bb63..773d8d8828ad77bb7006e039232b4d6bf6900dca 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -62,8 +62,9 @@
 /* NEC v850.  */
 #define PORT_V850E_UART        40
 
-/* DZ */
-#define PORT_DZ                47
+/* DEC */
+#define PORT_DZ                46
+#define PORT_ZS                47
 
 /* Parisc type numbers. */
 #define PORT_MUX       48
@@ -142,6 +143,9 @@
 /* Micrel KS8695 */
 #define PORT_KS8695    76
 
+/* Broadcom SB1250, etc. SOC */
+#define PORT_SB1250_DUART      77
+
 
 #ifdef __KERNEL__