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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
ff169e5cbe
commit
6fe18d26b1
@@ -58,7 +58,6 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/serialP.h>
|
||||
#include <linux/serial_reg.h>
|
||||
static char *serial_version = "4.30";
|
||||
|
||||
@@ -70,6 +69,7 @@ static char *serial_version = "4.30";
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/tty_flip.h>
|
||||
#include <linux/circ_buf.h>
|
||||
#include <linux/console.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/string.h>
|
||||
@@ -92,6 +92,24 @@ static char *serial_version = "4.30";
|
||||
#include <asm/amigahw.h>
|
||||
#include <asm/amigaints.h>
|
||||
|
||||
struct serial_state {
|
||||
struct tty_port tport;
|
||||
struct circ_buf xmit;
|
||||
struct async_icount icount;
|
||||
|
||||
unsigned long port;
|
||||
int baud_base;
|
||||
int xmit_fifo_size;
|
||||
int custom_divisor;
|
||||
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 */
|
||||
};
|
||||
|
||||
#define custom amiga_custom
|
||||
static char *serial_name = "Amiga-builtin serial driver";
|
||||
|
||||
|
Reference in New Issue
Block a user