Merge branch 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6] / drivers / char / riscom8.h

diff --git a/drivers/char/riscom8.h b/drivers/char/riscom8.h
index cdfdf43..c9876b3 100644 (file)
--- a/drivers/char/riscom8.h
+++ b/drivers/char/riscom8.h
@@ -66,23 +66,15 @@ struct riscom_board {
        
 struct riscom_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;