summaryrefslogtreecommitdiffstats
path: root/drivers/char/rtc.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-10-15 22:03:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 11:21:39 -0700
commit0f4d3fd8ac76122675de900d67a470306647374b (patch)
treeadd35c1579ce20f65a35e8a02e2c3076182fb0d0 /drivers/char/rtc.c
parentf841a487d4dff35386e989768ec03a86a376bfde (diff)
downloadop-kernel-dev-0f4d3fd8ac76122675de900d67a470306647374b.zip
op-kernel-dev-0f4d3fd8ac76122675de900d67a470306647374b.tar.gz
legacy rtc: remove needless/confusing HPET_RTC_IRQ option
HPET_RTC_IRQ is no longer needed; HPET_EMULATE_RTC suffices and is more correct. (http://bugzilla.kernel.org/show_bug.cgi?id=11111) Note that when using the legacy RTC driver, platforms don't really do a dynamic switch between HPET and non-HPET modes based on whether HPET hardware actually exists ... only rtc-cmos (using the new RTC framework) currently switches that way. So this reflects bitrot in that legacy code, for x86/ia64: kernels with HPET support configured (e.g. for a clocksource) can't get IRQs from the legacy RTC driver unless they really have HPET hardware. (The obvious workaround is to not use the legacy RTC driver on those platforms when you configure HPET ... unless you know the target really has a HPET.) Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/rtc.c')
-rw-r--r--drivers/char/rtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index b47710c..17683de 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -96,7 +96,7 @@ static unsigned long rtc_port;
static int rtc_irq;
#endif
-#ifdef CONFIG_HPET_RTC_IRQ
+#ifdef CONFIG_HPET_EMULATE_RTC
#undef RTC_IRQ
#endif
OpenPOWER on IntegriCloud