From: Venkatesh Pallipadi Date: Thu, 4 Aug 2005 22:36:10 +0000 (-0700) Subject: [PATCH] remove special HPET_EMULATE_RTC config option X-Git-Tag: v2.6.13-rc6~47 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9;p=~emulex%2Finfiniband.git [PATCH] remove special HPET_EMULATE_RTC config option We had a user whose apps weren't working correctly because his "rtc" wasn't working fully. For the sake of simplicity, it seems sensible to always enable HPET RTC emulation. Remove a special config option for HPET_EMULATE_RTC and make it directly depend on HPET_TIMER and RTC. This will avoid the hangs when EMULATE_RTC is not configured and when some userlevel script depends on RTC interrupt, as in: http://bugzilla.kernel.org/show_bug.cgi?id=4904 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index a801d9d4860..619d843ba23 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -454,8 +454,9 @@ config HPET_TIMER Choose N to continue using the legacy 8254 timer. config HPET_EMULATE_RTC - bool "Provide RTC interrupt" + bool depends on HPET_TIMER && RTC=y + default y config SMP bool "Symmetric multi-processing support"