diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/char/i810-tco.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/char/i810-tco.c')
| -rw-r--r-- | drivers/char/i810-tco.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/i810-tco.c b/drivers/char/i810-tco.c index fcd105d35..b01564030 100644 --- a/drivers/char/i810-tco.c +++ b/drivers/char/i810-tco.c @@ -301,10 +301,9 @@ static int __init watchdog_init (void) tco_timer_settimer ((unsigned char) i810_margin); tco_timer_reload (); - /* FIXME: no floating point math */ printk (KERN_INFO "i810 TCO timer: V0.02, timer margin: %d sec (0x%04x)\n", - (int) (i810_margin * 0.6), TCOBASE); + (int) (i810_margin * 6 / 10), TCOBASE); return 0; } |