TTY: simserial no longer needs serialP

Let's do a spin-off of serial_state structure with only needed
elements.

And remove serialP crap from includes.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 3698a2fe221ddbaff86e262dd7844ca6e5644b7b..120aad4d536261efa20dc175525b50da37ffcf34 100644 (file)
--- 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 e5e8442c08d6c017034e07819b6f0cf826127bd8..9a04dec1589aeb81c28a1c4d88bcdcf9136c651f 100644 (file)
--- 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 */
 };