diff options
author | Len Brown <len.brown@intel.com> | 2005-08-05 00:49:06 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:49:06 -0400 |
commit | c202ac9fbdb64145f034be266d6ee88c98b40aa8 (patch) | |
tree | f654a0a0d3f87cf82c3026670f9dda551dc82b2f /arch/i386 | |
parent | 4be44fcd3bf648b782f4460fd06dfae6c42ded4b (diff) | |
parent | c306895167c8384b88bc02945a0d226a04218fa5 (diff) |
Merge ../to-linus
Diffstat (limited to 'arch/i386')
-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 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" |