diff options
| author | Robert Picco <robert.picco@hp.com> | 2004-06-29 05:18:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-29 05:18:44 -0700 |
| commit | 7f93b631ec79c6a1fd7cf081467eaff8a780edbd (patch) | |
| tree | ab5689da95e9ab65f92d08d0ebc5834fb9f79c8c /drivers | |
| parent | f02c3bc485a7ccba42acb8c1dd63db3ea1bf632f (diff) | |
[PATCH] hpet fixes
Some hpet clean up and a fix to the RTC request_irq issue.
Signed-off-by: Bob Picco <Robert.Picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/char/rtc.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index f9b27629baaf..a8b61668d17c 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -971,8 +971,8 @@ config HPET default n depends on ACPI help - If you say Y here, you will have a device named "/dev/hpet/XX" for - each timer supported by the HPET. The timers are + If you say Y here, you will have a miscdevice named "/dev/hpet/". Each + open selects one of the timers supported by the HPET. The timers are non-periodioc and/or periodic. config HPET_RTC_IRQ diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 641fe5e8a288..207a8b8bba5f 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -99,7 +99,6 @@ static int rtc_irq = PCI_IRQ_NONE; #ifdef CONFIG_HPET_RTC_IRQ #undef RTC_IRQ -#define RTC_IRQ 0 #endif #ifdef RTC_IRQ |