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>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 700ff9679457efb2a6efe56604f4994ea11f76ab..122254155ae16019e4b56288b2fcdecf67509c6e 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1043,15 +1043,6 @@ config HPET
          open selects one of the timers supported by the HPET.  The timers are
          non-periodic and/or periodic.
 
-config HPET_RTC_IRQ
-       bool
-       default HPET_EMULATE_RTC
-       depends on RTC && HPET
-       help
-         If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
-         is assumed the platform called hpet_alloc with the RTC IRQ values for
-         the HPET timers.
-
 config HPET_MMAP
        bool "Allow mmap of HPET"
        default y

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index b47710c178855399395b40b41edbc140981df683..17683de95717e2a2b5eb763fa345ce418fed6181 100644 (file)
--- 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