diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /drivers/char/ip2main.c | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
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 449bd2f76..6fbfe22df 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c @@ -329,8 +329,7 @@ static long bh_counter = 0; * selected, the board is serviced periodically to see if anything needs doing. */ #define POLL_TIMEOUT (jiffies + 1) -static struct timer_list PollTimer = { {NULL, NULL}, 0, 0, ip2_poll }; -// next, prev, expires,data, func() +static struct timer_list PollTimer = { function: ip2_poll }; static char TimerOn = 0; #ifdef IP2DEBUG_TRACE |