commit 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026
author Andi Kleen <ak@suse.de> Tue May 31 14:39:26 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue May 31 14:54:17 2005 -0700
tree be2ec5c930b79825eff6d61f758bd54dd582ec8e
parent 8d91640606c47551771a9b27664f249f4b176613

[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>

arch/x86_64/Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0f430d9..289f448 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -305,6 +305,7 @@
 
 config X86_PM_TIMER
 	bool "PM timer"
+	depends on ACPI
 	default y
 	help
 	  Support the ACPI PM timer for time keeping. This is slow,