From: Andi Kleen <ak@suse.de>
Date: Tue, 31 May 2005 21:39:26 +0000 (-0700)
Subject: [PATCH] x86_64 CONFIG_ACPI=n build fix
X-Git-Tag: v2.6.12-rc6~74
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2be6a0fa186e2cb0cf14f41f20b08a5809a026;p=linux-2.6

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

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0f430d9d36..289f448ac8 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,