vserver 2.0-pre4

[linux-2.6.git] / drivers / char / synclink.c

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 48ce9f4..9341f3b 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -189,8 +189,8 @@ struct mgsl_struct {
        int                     count;          /* count of opens */
        int                     line;
        int                     hw_version;
-       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;
        
@@ -4376,11 +4376,7 @@ static struct mgsl_struct* mgsl_allocate_device(void)
                INIT_WORK(&info->task, mgsl_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);