Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6.git] / drivers / isdn / gigaset / gigaset.h
index 8fad99e..1dc2513 100644 (file)
@@ -433,8 +433,7 @@ struct cardstate {
        spinlock_t cmdlock;
        unsigned curlen, cmdbytes;
 
-       unsigned open_count;
-       struct tty_struct *tty;
+       struct tty_port port;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;