vserver 2.0-pre4

[linux-2.6.git] / drivers / char / pcmcia / synclink_cs.c

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index b516e54..ce49fac 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -146,8 +146,8 @@ typedef struct _mgslpc_info {
        int                     flags;
        int                     count;          /* count of opens */
        int                     line;
-       unsigned short          close_delay;
-       unsigned short          closing_wait;   /* time to wait before closing */
+       unsigned int            close_delay;
+       unsigned int            closing_wait;   /* time to wait before closing */
        
        struct mgsl_icount      icount;
        
@@ -561,11 +561,7 @@ static dev_link_t *mgslpc_attach(void)
     INIT_WORK(&info->task, bh_handler, info);
     info->max_frame_size = 4096;
     info->close_delay = 5*HZ/10;
-    #if HZ < 2185
     info->closing_wait = 30*HZ;
-    #else
-    info->closing_wait = 65534;
-    #endif
     init_waitqueue_head(&info->open_wait);
     init_waitqueue_head(&info->close_wait);
     init_waitqueue_head(&info->status_event_wait_q);