aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2011-07-08 17:11:16 -0400
committerJiri Kosina <jkosina@suse.cz>2011-07-11 08:20:07 -0400
commit2dc98fd3206f8106520eced769781a21a20707ca (patch)
tree857ed229510c30208202b9856c20434cf1f1c7cb
parent587360885c0e7aa403831c29be1984b746fd24fb (diff)
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/x86/Kconfig4
-rw-r--r--kernel/power/Kconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da349723d411..ab03e883206f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1737,8 +1737,8 @@ menuconfig APM
1737 machines with more than one CPU. 1737 machines with more than one CPU.
1738 1738
1739 In order to use APM, you will need supporting software. For location 1739 In order to use APM, you will need supporting software. For location
1740 and more information, read <file:Documentation/power/pm.txt> and the 1740 and more information, read <file:Documentation/power/apm-acpi.txt>
1741 Battery Powered Linux mini-HOWTO, available from 1741 and the Battery Powered Linux mini-HOWTO, available from
1742 <http://www.tldp.org/docs.html#howto>. 1742 <http://www.tldp.org/docs.html#howto>.
1743 1743
1744 This driver does not spin down disk drives (see the hdparm(8) 1744 This driver does not spin down disk drives (see the hdparm(8)
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 87f4d24b55b0..bcd8fce351b7 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -193,8 +193,8 @@ config APM_EMULATION
193 notification of APM "events" (e.g. battery status change). 193 notification of APM "events" (e.g. battery status change).
194 194
195 In order to use APM, you will need supporting software. For location 195 In order to use APM, you will need supporting software. For location
196 and more information, read <file:Documentation/power/pm.txt> and the 196 and more information, read <file:Documentation/power/apm-acpi.txt>
197 Battery Powered Linux mini-HOWTO, available from 197 and the Battery Powered Linux mini-HOWTO, available from
198 <http://www.tldp.org/docs.html#howto>. 198 <http://www.tldp.org/docs.html#howto>.
199 199
200 This driver does not spin down disk drives (see the hdparm(8) 200 This driver does not spin down disk drives (see the hdparm(8)