summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2011-07-08 23:11:16 +0200
committerJiri Kosina <jkosina@suse.cz>2011-07-11 14:20:07 +0200
commit2dc98fd3206f8106520eced769781a21a20707ca (patch)
tree857ed229510c30208202b9856c20434cf1f1c7cb
parentdrivers/net: static should be at beginning of declaration (diff)
downloadlinux-2dc98fd3206f8106520eced769781a21a20707ca.tar.xz
linux-2dc98fd3206f8106520eced769781a21a20707ca.zip
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
machines with more than one CPU.
In order to use APM, you will need supporting software. For location
- and more information, read <file:Documentation/power/pm.txt> and the
- Battery Powered Linux mini-HOWTO, available from
+ and more information, read <file:Documentation/power/apm-acpi.txt>
+ and the Battery Powered Linux mini-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
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
notification of APM "events" (e.g. battery status change).
In order to use APM, you will need supporting software. For location
- and more information, read <file:Documentation/power/pm.txt> and the
- Battery Powered Linux mini-HOWTO, available from
+ and more information, read <file:Documentation/power/apm-acpi.txt>
+ and the Battery Powered Linux mini-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.
This driver does not spin down disk drives (see the hdparm(8)