diff options
| author | Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 2005-08-04 18:36:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 19:27:58 -0400 |
| commit | c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9 (patch) | |
| tree | 3f19ec2917f15fdf2428b60941a4d5c9d7e0422d | |
| parent | 1c5ad84516ae7ea4ec868436a910a6bd8d20215a (diff) | |
[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 <venkatesh.pallipadi@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index a801d9d48606..619d843ba231 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -454,8 +454,9 @@ config HPET_TIMER | |||
| 454 | Choose N to continue using the legacy 8254 timer. | 454 | Choose N to continue using the legacy 8254 timer. |
| 455 | 455 | ||
| 456 | config HPET_EMULATE_RTC | 456 | config HPET_EMULATE_RTC |
| 457 | bool "Provide RTC interrupt" | 457 | bool |
| 458 | depends on HPET_TIMER && RTC=y | 458 | depends on HPET_TIMER && RTC=y |
| 459 | default y | ||
| 459 | 460 | ||
| 460 | config SMP | 461 | config SMP |
| 461 | bool "Symmetric multi-processing support" | 462 | bool "Symmetric multi-processing support" |