From 2d373c587fc66939019c31ce6aee7d7f1f6ce9c9 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 31 May 2005 14:39:26 -0700
Subject: [PATCH] --- yaml --- r: 1719 b: refs/heads/master c:
 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 h: refs/heads/master i:   1717:
 ace834932032745025cbe1417a5ef096f710cdb6   1715:
 9f4ba08eab6b73accd86741caef250305e332fab   1711:
 cead61c3e8af9ca34ebb78f7d1843b02a1e39301 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86_64/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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,