summaryrefslogtreecommitdiffstats
path: root/drivers/staging/speakup/serialio.h
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:52:11 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 11:47:02 -0800
commit3ee0017e03cd790ed1adaa97ef6f99aff3706ec2 (patch)
tree59cfd3fd39c88145dd581a622b555e3bd119d17d /drivers/staging/speakup/serialio.h
parent11ba8899f96066600a7adeee28baed7a4a8cb7eb (diff)
downloadop-kernel-dev-3ee0017e03cd790ed1adaa97ef6f99aff3706ec2.zip
op-kernel-dev-3ee0017e03cd790ed1adaa97ef6f99aff3706ec2.tar.gz
TTY: speakup, do not use serialP
The structures there are going away. And speakup has enough troubles already. So define a structure similar to what 8250 does: old_serial_port. There define an array of speed, port base and so on needed for configuration. Then use this structure instead of serial_state defined in serialP.h. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: William Hubbs <w.d.hubbs@gmail.com> Cc: Chris Brannon <chris@the-brannons.com> Cc: Kirk Reiser <kirk@braille.uwo.ca> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/speakup/serialio.h')
-rw-r--r--drivers/staging/speakup/serialio.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
index d785b1f..614271f 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -4,11 +4,22 @@
#include <linux/serial.h> /* for rs_table, serial constants &
serial_uart_config */
#include <linux/serial_reg.h> /* for more serial constants */
-#include <linux/serialP.h> /* for struct serial_state */
#ifndef __sparc__
#include <asm/serial.h>
#endif
+/*
+ * this is cut&paste from 8250.h. Get rid of the structure, the definitions
+ * and this whole broken driver.
+ */
+struct old_serial_port {
+ unsigned int uart; /* unused */
+ unsigned int baud_base;
+ unsigned int port;
+ unsigned int irq;
+ unsigned int flags; /* unused */
+};
+
/* countdown values for serial timeouts in us */
#define SPK_SERIAL_TIMEOUT 100000
/* countdown values transmitter/dsr timeouts in us */
OpenPOWER on IntegriCloud