Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / char / epca.h

diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index a297238..d414bf2 100644 (file)
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -77,7 +77,6 @@ static char *board_desc[] =
 #define ON         1
 
 #define FEPTIMEOUT 200000  
-#define SERIAL_TYPE_NORMAL  1
 #define SERIAL_TYPE_INFO    3
 #define EPCA_EVENT_HANGUP   1
 #define EPCA_MAGIC          0x5c6df104L
@@ -85,6 +84,7 @@ static char *board_desc[] =
 struct channel 
 {
        long   magic;
+       struct tty_port port;
        unsigned char boardnum;
        unsigned char channelnum;
        unsigned char omodem;         /* FEP output modem status     */
@@ -118,10 +118,7 @@ struct channel
        unsigned short rxbufhead;
        unsigned short rxbufsize;
        int    close_delay;
-       int    count;
-       int    blocked_open;
        unsigned long  event;
-       int    asyncflags;
        uint   dev;
        unsigned long  statusflags;
        unsigned long  c_iflag;
@@ -133,9 +130,6 @@ struct channel
        struct board_info           *board;
        struct board_chan           __iomem *brdchan;
        struct digi_struct          digiext;
-       struct tty_struct           *tty;
-       wait_queue_head_t           open_wait;
-       wait_queue_head_t           close_wait;
        struct work_struct          tqueue;
        struct global_data          __iomem *mailbox;
 };