Skip to content

Commit

Permalink
rtc: make HPET_RTC_IRQ track HPET_EMULATE_RTC
Browse files Browse the repository at this point in the history
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: David Brownell <dbrownell@users.sourceforge.net>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
David Brownell authored and Linus Torvalds committed Jun 13, 2008
1 parent 1da2e3d commit e6d2bb2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ config NVRAM
if RTC_LIB=n

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 \
&& !ARM && !SUPERH && !S390 && !AVR32
---help---
Expand Down Expand Up @@ -1036,9 +1036,9 @@ config HPET
non-periodic and/or periodic.

config HPET_RTC_IRQ
bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
default n
depends on HPET
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
Expand Down

0 comments on commit e6d2bb2

Please sign in to comment.