diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/char/rtc.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/char/rtc.c')
| -rw-r--r-- | drivers/char/rtc.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index bd5b20acb..d916a6aba 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -39,10 +39,11 @@ * 1.10a Andrea Arcangeli: Alpha updates * 1.10b Andrew Morton: SMP lock fix * 1.10c Cesar Barros: SMP locking fixes and cleanup - * 1.10d Maciej W. Rozycki: Handle DECstation's year weirdness. + * 1.10d Paul Gortmaker: delete paranoia check in rtc_exit + * 1.10e Maciej W. Rozycki: Handle DECstation's year weirdness. */ -#define RTC_VERSION "1.10d" +#define RTC_VERSION "1.10e" #define RTC_IO_EXTENT 0x10 /* Only really two ports, but... */ @@ -743,18 +744,6 @@ found: static void __exit rtc_exit (void) { - /* interrupts and maybe timer disabled at this point by rtc_release */ - /* FIXME: Maybe??? */ - - if (rtc_status & RTC_TIMER_ON) { - spin_lock_irq (&rtc_lock); - rtc_status &= ~RTC_TIMER_ON; - del_timer(&rtc_irq_timer); - spin_unlock_irq (&rtc_lock); - - printk(KERN_WARNING "rtc_exit(), and timer still running.\n"); - } - remove_proc_entry ("driver/rtc", NULL); misc_deregister(&rtc_dev); |