1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 143cc432fdb2..21f3ff53ba32 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1125,18 +1125,14 @@ Warnings: This function writes the data byte without checking to see if
 struct r_port {
        int magic;
+        struct tty_port port;
        int line;
-        int flags;
+        int flags;              /* Don't yet match the ASY_ flags!! */
-        int count;
-        int blocked_open;
-        struct tty_struct *tty;
        unsigned int board:3;
        unsigned int aiop:2;
        unsigned int chan:3;
        CONTROLLER_t *ctlp;
        CHANNEL_t channel;
-        int closing_wait;
-        int close_delay;
        int intmask;
        int xmit_fifo_room;     /* room in xmit fifo */
        unsigned char *xmit_buf;
@@ -1148,8 +1144,7 @@ struct r_port {
        int read_status_mask;
        int cps;
-        wait_queue_head_t open_wait;
+        struct completion close_wait;   /* Not yet matching the core */
-        struct completion close_wait;
        spinlock_t slock;
        struct mutex write_mtx;
 };