Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f79c67d..1ad3753 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -80,6 +80,12 @@
 /* SGI IP22 aka Indy / Challenge S / Indigo 2 */
 #define PORT_IP22ZILOG 56
 
+/* Sharp LH7a40x -- an ARM9 SoC series */
+#define PORT_LH7A40X   57
+
+/* PPC CPM type number */
+#define PORT_CPM        58
+
 #ifdef __KERNEL__
 
 #include <linux/config.h>
@@ -199,7 +205,6 @@ struct uart_port {
 #define UPF_CONS_FLOW          (1 << 23)
 #define UPF_SHARE_IRQ          (1 << 24)
 #define UPF_BOOT_AUTOCONF      (1 << 28)
-#define UPF_RESOURCES          (1 << 30)
 #define UPF_IOREMAP            (1 << 31)
 
 #define UPF_CHANGE_MASK                (0x17fff)