aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-13 01:59:53 -0400
committerLen Brown <len.brown@intel.com>2008-03-13 01:59:53 -0400
commit29ea5171cbd08a7ef37e543cbf02447033f0e289 (patch)
tree80d6c7f8e002117283dd1c1db4d3a915833652c7 /kernel
parentb4de123a0bc4a3f0c90899864d51299628729952 (diff)
parent53471121a8aad3f0b590bfce7c95a1f5f52150f3 (diff)
downloadkernel_samsung_aries-29ea5171cbd08a7ef37e543cbf02447033f0e289.zip
kernel_samsung_aries-29ea5171cbd08a7ef37e543cbf02447033f0e289.tar.gz
kernel_samsung_aries-29ea5171cbd08a7ef37e543cbf02447033f0e289.tar.bz2
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 7983317..6233f3b 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>.