diff --git a/[refs] b/[refs] index 4294462df8c9..a3ec9256bc9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12aad550f005fef2dd0ad40e4978549f64f8f296 +refs/heads/master: 82c3b87b7e0153c5a05ac994cd5586df41264cb6 diff --git a/trunk/drivers/tty/serial/crisv10.h b/trunk/drivers/tty/serial/crisv10.h index 7146ed29d508..59f70c4cc860 100644 --- a/trunk/drivers/tty/serial/crisv10.h +++ b/trunk/drivers/tty/serial/crisv10.h @@ -86,15 +86,10 @@ struct e100_serial { volatile int tr_running; /* 1 if output is running */ - struct tty_struct *tty; - int read_status_mask; - int ignore_status_mask; int x_char; /* xon/xoff character */ int close_delay; unsigned short closing_wait; - unsigned short closing_wait2; unsigned long event; - unsigned long last_active; int line; int type; /* PORT_ETRAX */ int count; /* # of fd on device */ @@ -108,7 +103,6 @@ struct e100_serial { struct work_struct work; struct async_icount icount; /* error-statistics etc.*/ struct ktermios normal_termios; - struct ktermios callout_termios; wait_queue_head_t open_wait; wait_queue_head_t close_wait;