diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:00 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:00 +0200 |
commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /arch/i386/Kconfig | |
parent | [PATCH] ieee80211: Fix frame control pver mask (diff) | |
parent | Revert PCIBIOS_MIN_IO changes for 2.6.13 (diff) | |
download | linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.tar.xz linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/Kconfig')
-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 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" |