diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 12:48:27 -0800 |
| commit | 3c4782dcd9b8d02e79f0f0bd1fe6e30a79790526 (patch) | |
| tree | 37ddd0011b1a8ffa8e656fe23f6745c80f23b73b | |
| parent | 98e3a9e6dd99f1b8ac2a03b8b4942eec16ef911b (diff) | |
| download | blackbird-op-linux-3c4782dcd9b8d02e79f0f0bd1fe6e30a79790526.tar.gz blackbird-op-linux-3c4782dcd9b8d02e79f0f0bd1fe6e30a79790526.zip | |
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>
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 9 | ||||
| -rw-r--r-- | include/linux/serialP.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 3698a2fe221d..120aad4d5362 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 e5e8442c08d6..9a04dec1589a 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 */ }; |
