---

yaml --- r: 25182 b: refs/heads/master c: 3e6e952 h: refs/heads/master v: v3
git-mirror · Mar 31, 2006 · 45cbf46 · 45cbf46
1 parent 3f626d8
commit 45cbf46
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: 3a3f8a126d97cb5bdde92a26136402e88220b30f
+refs/heads/master: 3e6e952d1d17e5cd2e25a438662d906c44ffcfaa
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
@@ -41,7 +41,7 @@ config SOFTWARE_SUSPEND
 	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
-	  It doesn't need APM.
+	  It doesn't need ACPI or APM.
 	  You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
 	  (patch for sysvinit needed).