summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-05-31 14:39:26 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 14:54:17 -0700
commit9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 (patch)
treebe2ec5c930b79825eff6d61f758bd54dd582ec8e /arch
parent8d91640606c47551771a9b27664f249f4b176613 (diff)
downloadlinux-9c2be6a0fa186e2cb0cf14f41f20b08a5809a026.tar.bz2
[PATCH] x86_64 CONFIG_ACPI=n build fix
Make CONFIG_X86_PM_TIMER dependent on CONFIG_ACPI Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0f430d9d3632..289f448ac89c 100644
--- a/arch/x86_64/Kconfig
+++ b/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,