Commit e6d2bb2b authored by David Brownell's avatar David Brownell Committed by Linus Torvalds

rtc: make HPET_RTC_IRQ track HPET_EMULATE_RTC

More Kconfig tweaks related to the legacy PC RTC code:

 - Describe the legacy PC RTC driver as such ... it's never quite
   been clear that this driver is for PC RTCs, and now it's fair
   to call this the "legacy" driver.

 - Force it to understand about HPET stealing its IRQs ... kernel
   code does this always when HPET is in use, there should be no
   option for users to goof up the config.

This seems to fix kernel bugzilla #10729.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1da2e3d6
...@@ -749,7 +749,7 @@ config NVRAM ...@@ -749,7 +749,7 @@ config NVRAM
if RTC_LIB=n if RTC_LIB=n
config RTC config RTC
tristate "Enhanced Real Time Clock Support" tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
&& !ARM && !SUPERH && !S390 && !AVR32 && !ARM && !SUPERH && !S390 && !AVR32
---help--- ---help---
...@@ -1036,9 +1036,9 @@ config HPET ...@@ -1036,9 +1036,9 @@ config HPET
non-periodic and/or periodic. non-periodic and/or periodic.
config HPET_RTC_IRQ config HPET_RTC_IRQ
bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC bool
default n default HPET_EMULATE_RTC
depends on HPET depends on RTC && HPET
help help
If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It 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 is assumed the platform called hpet_alloc with the RTC IRQ values for
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment