--- zzzz-none-000/linux-2.6.28.10/include/linux/serial_core.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/include/linux/serial_core.h	2009-11-05 12:32:20.000000000 +0000
@@ -20,27 +20,7 @@
 #ifndef LINUX_SERIAL_CORE_H
 #define LINUX_SERIAL_CORE_H
 
-/*
- * The type definitions.  These are from Ted Ts'o's serial.h
- */
-#define PORT_UNKNOWN	0
-#define PORT_8250	1
-#define PORT_16450	2
-#define PORT_16550	3
-#define PORT_16550A	4
-#define PORT_CIRRUS	5
-#define PORT_16650	6
-#define PORT_16650V2	7
-#define PORT_16750	8
-#define PORT_STARTECH	9
-#define PORT_16C950	10
-#define PORT_16654	11
-#define PORT_16850	12
-#define PORT_RSA	13
-#define PORT_NS16550A	14
-#define PORT_XSCALE	15
-#define PORT_RM9000	16	/* PMC-Sierra RM9xxx internal UART */
-#define PORT_MAX_8250	16	/* max port ID */
+#include <linux/serial.h>
 
 /*
  * ARM specific type numbers.  These are not currently guaranteed
@@ -158,6 +138,9 @@
 /* SH-SCI */
 #define PORT_SCIFA	83
 
+/*--- AR9 ---*/
+#define PORT_IFX_ASC	84
+
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>
@@ -310,7 +293,7 @@
 	struct device		*dev;			/* parent device */
 	unsigned char		hub6;			/* this should be in the 8250 driver */
 	unsigned char		suspended;
-	unsigned char		unused[2];
+	unsigned char		unused[3];
 	void			*private_data;		/* generic platform data pointer */
 };