---

yaml --- r: 18607 b: refs/heads/master c: e25db98 h: refs/heads/master i: 18605: 7d89d8d 18603: 14a33bf 18599: f4f83da 18591: 393e1d6 v: v3
git-mirror · Jan 16, 2006 · 0c27fee · 0c27fee
1 parent 52436cb
commit 0c27fee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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