diff --git a/[refs] b/[refs] index c43c9259974b..d05404fba693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c5ad84516ae7ea4ec868436a910a6bd8d20215a +refs/heads/master: c91096d85c95c6b7fe8d7065e2aa6825e0bdaca9 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index a801d9d48606..619d843ba231 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/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"