2 files changed, 8 insertions, 3 deletions

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 3698a2fe221..120aad4d536 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -27,10 +27,10 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/capability.h>
+#include <linux/circ_buf.h>
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 #include <linux/sysrq.h>
 
 #include <asm/irq.h>
@@ -46,6 +46,13 @@
 
 #define NR_PORTS        1       /* only one port for now */
 
+struct serial_state {
+        struct tty_port tport;
+        struct circ_buf xmit;
+        int irq;
+        int x_char;
+};
+
 static char *serial_name = "SimSerial driver";
 static char *serial_version = "0.6";
 
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index e5e8442c08d..9a04dec1589 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -44,10 +44,8 @@ struct serial_state {
         int                     quot;
         int                     IER;    /* Interrupt Enable Register */
         int                     MCR;    /* Modem control register */
-        /* simserial */
         int                     x_char; /* xon/xoff character */
         struct circ_buf         xmit;
-        /* /simserial */
         /* /amiserial */
 };