VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 00c4b08..e7e8bb9 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -59,14 +59,6 @@
 /* NEC v850.  */
 #define PORT_V850E_UART        40
 
-/* NEC PC-9800 */
-#define PORT_8251_PC98 41
-#define PORT_19K_PC98  42
-#define PORT_FIFO_PC98 43
-#define PORT_VFAST_PC98        44
-#define PORT_PC9861    45
-#define PORT_PC9801_101        46
-
 /* DZ */
 #define PORT_DZ                47
 
@@ -88,6 +80,15 @@
 /* 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
+
+/* MPC52xx type numbers */
+#define PORT_MPC52xx   59
+
 #ifdef __KERNEL__
 
 #include <linux/config.h>
@@ -207,7 +208,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)