summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-13 06:59:53 +0100
committerLen Brown <len.brown@intel.com>2008-03-13 06:59:53 +0100
commit29ea5171cbd08a7ef37e543cbf02447033f0e289 (patch)
tree80d6c7f8e002117283dd1c1db4d3a915833652c7 /kernel
parentMerge branches 'release', 'ejd', 'sony' and 'wmi' into release (diff)
parentdocumentation: Move power-related files to Documentation/power/ (diff)
downloadlinux-29ea5171cbd08a7ef37e543cbf02447033f0e289.tar.xz
linux-29ea5171cbd08a7ef37e543cbf02447033f0e289.zip
Merge branches 'release' and 'doc' into release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 79833170bb9c..6233f3b4ae66 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -190,7 +190,7 @@ 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/pm.txt> and the
+ and more information, read <file:Documentation/power/pm.txt> and the
Battery Powered Linux mini-HOWTO, available from
<http://www.tldp.org/docs.html#howto>.