Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[sfrench/cifs-2.6.git] / drivers / char / specialix_io8.h

diff --git a/drivers/char/specialix_io8.h b/drivers/char/specialix_io8.h
index 3f2f85bdf51649218dedf30c6f1bbda3c9d4e134..c63005274d9b89afbded4f810c1d7272e7cf33cc 100644 (file)
--- a/drivers/char/specialix_io8.h
+++ b/drivers/char/specialix_io8.h
@@ -107,23 +107,17 @@ struct specialix_board {
 
 struct specialix_port {
        int                     magic;
+       struct tty_port         port;
        int                     baud_base;
        int                     flags;
-       struct tty_struct       * tty;
-       int                     count;
-       int                     blocked_open;
        int                     timeout;
-       int                     close_delay;
        unsigned char           * xmit_buf;
        int                     custom_divisor;
        int                     xmit_head;
        int                     xmit_tail;
        int                     xmit_cnt;
-       wait_queue_head_t       open_wait;
-       wait_queue_head_t       close_wait;
        short                   wakeup_chars;
        short                   break_length;
-       unsigned short          closing_wait;
        unsigned char           mark_mask;
        unsigned char           IER;
        unsigned char           MSVR;