---

yaml --- r: 1719 b: refs/heads/master c: 9c2be6a h: refs/heads/master i: 1717: ace8349 1715: 9f4ba08 1711: cead61c v: v3
git-mirror · May 31, 2005 · 2d373c5 · 2d373c5
1 parent abd2c48
commit 2d373c5
Show file tree

Hide file tree

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