summaryrefslogtreecommitdiff
path: root/include/linux/serialP.h
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:52:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 12:50:01 -0800
commit6fe18d26b1c33d5cb748f8694ee1a59dc5578da4 (patch)
tree6b48713ac874c6a3bf394ceb212be58e175c79ee /include/linux/serialP.h
parentff169e5cbec29d33765687c7131673316011b328 (diff)
downloadlinux-3.10-6fe18d26b1c33d5cb748f8694ee1a59dc5578da4.tar.gz
linux-3.10-6fe18d26b1c33d5cb748f8694ee1a59dc5578da4.tar.bz2
linux-3.10-6fe18d26b1c33d5cb748f8694ee1a59dc5578da4.zip
TTY: amiserial no longer needs serialP
amiserial is the last user of serialP.h. Let's move struct serial_state directly to amiserial and remove serialP crap from includes. Finally, remove the header from the tree completely. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serialP.h')
-rw-r--r--include/linux/serialP.h49
1 files changed, 0 insertions, 49 deletions
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
deleted file mode 100644
index 77afbdb134a..00000000000
--- a/include/linux/serialP.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Private header file for the (dumb) serial driver
- *
- * Copyright (C) 1997 by Theodore Ts'o.
- *
- * Redistribution of this file is permitted under the terms of the GNU
- * Public License (GPL)
- */
-
-#ifndef _LINUX_SERIALP_H
-#define _LINUX_SERIALP_H
-
-/*
- * This is our internal structure for each serial port's state.
- *
- * Many fields are paralleled by the structure used by the serial_struct
- * structure.
- *
- * For definitions of the flags field, see tty.h
- */
-
-#include <linux/termios.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/circ_buf.h>
-#include <linux/tty.h>
-#include <linux/wait.h>
-
-struct serial_state {
- int baud_base;
- unsigned long port;
- int xmit_fifo_size;
- int custom_divisor;
- struct async_icount icount;
- struct tty_port tport;
-
- /* amiserial */
- int read_status_mask;
- int ignore_status_mask;
- int timeout;
- int quot;
- int IER; /* Interrupt Enable Register */
- int MCR; /* Modem control register */
- int x_char; /* xon/xoff character */
- struct circ_buf xmit;
- /* /amiserial */
-};
-
-#endif /* _LINUX_SERIAL_H */