diff options
Diffstat (limited to 'drivers/char/ip2main.c')
-rw-r--r-- | drivers/char/ip2main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c index cf0cd58d6305..9e4e26aef94e 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c | |||
@@ -120,7 +120,6 @@ | |||
120 | 120 | ||
121 | #include <linux/vmalloc.h> | 121 | #include <linux/vmalloc.h> |
122 | #include <linux/init.h> | 122 | #include <linux/init.h> |
123 | #include <asm/serial.h> | ||
124 | 123 | ||
125 | #include <asm/uaccess.h> | 124 | #include <asm/uaccess.h> |
126 | 125 | ||
@@ -255,7 +254,7 @@ static unsigned long bh_counter = 0; | |||
255 | * selected, the board is serviced periodically to see if anything needs doing. | 254 | * selected, the board is serviced periodically to see if anything needs doing. |
256 | */ | 255 | */ |
257 | #define POLL_TIMEOUT (jiffies + 1) | 256 | #define POLL_TIMEOUT (jiffies + 1) |
258 | static struct timer_list PollTimer = TIMER_INITIALIZER(ip2_poll, 0, 0); | 257 | static DEFINE_TIMER(PollTimer, ip2_poll, 0, 0); |
259 | static char TimerOn; | 258 | static char TimerOn; |
260 | 259 | ||
261 | #ifdef IP2DEBUG_TRACE | 260 | #ifdef IP2DEBUG_TRACE |