Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

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

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 1ad3753..4e57b45 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -86,6 +86,9 @@
 /* PPC CPM type number */
 #define PORT_CPM        58
 
+/* Marvell MPSC for PPC & MIPS */
+#define PORT_MPSC      59
+
 #ifdef __KERNEL__
 
 #include <linux/config.h>