From 0c27fee981b850dcb8078f3c85b4ef5694d94c43 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 16 Jan 2006 01:56:42 +0100
Subject: [PATCH] --- yaml --- r: 18607 b: refs/heads/master c:
 e25db98d9ae542f95d139e316a6d490ceddd141e h: refs/heads/master i:   18605:
 7d89d8d11bc775b0751b49857458526e2aae6251   18603:
 14a33bf257ec9211733819cff49d1ded7acbe0e7   18599:
 f4f83da75dadc58a3eb917b3508fdf5d1cebc294   18591:
 393e1d66403e46f3333c00042d69e7653aa23356 v: v3

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

diff --git a/[refs] b/[refs]
index 754650e94d61..c2a92a4c88e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f8efbb96f4b2679dcbd2c115380a47bd2089dcd
+refs/heads/master: e25db98d9ae542f95d139e316a6d490ceddd141e
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
index 2efc4be22709..787feff0e8a5 100644
--- a/trunk/arch/x86_64/Kconfig
+++ b/trunk/arch/x86_64/Kconfig
@@ -350,7 +350,7 @@ config HPET_TIMER
 	  <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
 config X86_PM_TIMER
-	bool "PM timer"
+	bool "PM timer" if EMBEDDED
 	depends on ACPI
 	default y
 	help