include of <linux/types.h> is preferred over <asm/types.h>

[linux-2.6-omap-h63xx.git] / include / linux / cyclades.h

diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 504cb2c3fa9a68fb77a0a4b3afb94a933c095f9c..d06fbf286346fdd65eb3e84451866a7c8c84c7f8 100644 (file)
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -150,8 +150,6 @@ struct CYZ_BOOT_CTRL {
  *     architectures and compilers.
  */
 
-#include <asm/types.h>
-
 typedef __u64  ucdouble;               /* 64 bits, unsigned */
 typedef __u32  uclong;                 /* 32 bits, unsigned */
 typedef __u16  ucshort;                /* 16 bits, unsigned */
@@ -550,11 +548,11 @@ struct cyclades_icount {
 
 struct cyclades_port {
        int                     magic;
+       struct tty_port         port;
        struct cyclades_card    *card;
        int                     line;
        int                     flags;          /* defined in tty.h */
        int                     type;           /* UART type */
-       struct tty_struct       *tty;
        int                     read_status_mask;
        int                     ignore_status_mask;
        int                     timeout;
@@ -567,13 +565,8 @@ struct cyclades_port {
        int                     chip_rev;
        int                     custom_divisor;
        u8                      x_char; /* to be pushed out ASAP */
-       int                     close_delay;
-       unsigned short          closing_wait;
-       int                     count;  /* # of fd on device */
        int                     breakon;
        int                     breakoff;
-       int                     blocked_open; /* # of blocked opens */
-       unsigned char           *xmit_buf;
        int                     xmit_head;
        int                     xmit_tail;
        int                     xmit_cnt;
@@ -583,16 +576,14 @@ struct cyclades_port {
        struct cyclades_monitor mon;
        struct cyclades_idle_stats      idle_stats;
        struct cyclades_icount  icount;
-       wait_queue_head_t       open_wait;
-       wait_queue_head_t       close_wait;
        struct completion       shutdown_wait;
        wait_queue_head_t       delta_msr_wait;
        int throttle;
 };
 
 #define        CLOSING_WAIT_DELAY      30*HZ
-#define CY_CLOSING_WAIT_NONE   65535
-#define CY_CLOSING_WAIT_INF    0
+#define CY_CLOSING_WAIT_NONE   ASYNC_CLOSING_WAIT_NONE
+#define CY_CLOSING_WAIT_INF    ASYNC_CLOSING_WAIT_INF
 
 
 #define CyMAX_CHIPS_PER_CARD   8