diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/mips64/sgi-ip22 | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/mips64/sgi-ip22')
| -rw-r--r-- | arch/mips64/sgi-ip22/ip22-reset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips64/sgi-ip22/ip22-reset.c b/arch/mips64/sgi-ip22/ip22-reset.c index 7146076d1..e8d4ff345 100644 --- a/arch/mips64/sgi-ip22/ip22-reset.c +++ b/arch/mips64/sgi-ip22/ip22-reset.c @@ -87,9 +87,7 @@ static void blink_timeout(unsigned long data) sgi_hpc_write1 ^= (HPC3_WRITE1_LC0OFF|HPC3_WRITE1_LC1OFF); hpc3mregs->write1 = sgi_hpc_write1; - del_timer(&blink_timer); - blink_timer.expires = jiffies + data; - add_timer(&blink_timer); + mod_timer(&blink_timer, jiffies+data); } static void debounce(unsigned long data) |