Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / drivers / char / specialix_io8.h

diff --git a/drivers/char/specialix_io8.h b/drivers/char/specialix_io8.h
index 895bd90de3631ac49941129a1ed015747090020f..3f2f85bdf51649218dedf30c6f1bbda3c9d4e134 100644 (file)
--- a/drivers/char/specialix_io8.h
+++ b/drivers/char/specialix_io8.h
@@ -112,7 +112,6 @@ struct specialix_port {
        struct tty_struct       * tty;
        int                     count;
        int                     blocked_open;
-       ulong                   event;
        int                     timeout;
        int                     close_delay;
        unsigned char           * xmit_buf;
@@ -122,8 +121,6 @@ struct specialix_port {
        int                     xmit_cnt;
        wait_queue_head_t       open_wait;
        wait_queue_head_t       close_wait;
-       struct work_struct      tqueue;
-       struct work_struct      tqueue_hangup;
        short                   wakeup_chars;
        short                   break_length;
        unsigned short          closing_wait;