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