diff --git a/[refs] b/[refs] index 83d1ec4a5377..9b135d454b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d91640606c47551771a9b27664f249f4b176613 +refs/heads/master: 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 0f430d9d3632..289f448ac89c 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -305,6 +305,7 @@ config HPET_TIMER config X86_PM_TIMER bool "PM timer" + depends on ACPI default y help Support the ACPI PM timer for time keeping. This is slow,