diff options
| author | Len Brown <len.brown@intel.com> | 2008-03-13 01:59:53 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-03-13 01:59:53 -0400 |
| commit | 29ea5171cbd08a7ef37e543cbf02447033f0e289 (patch) | |
| tree | 80d6c7f8e002117283dd1c1db4d3a915833652c7 /kernel | |
| parent | b4de123a0bc4a3f0c90899864d51299628729952 (diff) | |
| parent | 53471121a8aad3f0b590bfce7c95a1f5f52150f3 (diff) | |
Merge branches 'release' and 'doc' into release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 2 |
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 | |||
| 190 | notification of APM "events" (e.g. battery status change). | 190 | notification of APM "events" (e.g. battery status change). |
| 191 | 191 | ||
| 192 | In order to use APM, you will need supporting software. For location | 192 | In order to use APM, you will need supporting software. For location |
| 193 | and more information, read <file:Documentation/pm.txt> and the | 193 | and more information, read <file:Documentation/power/pm.txt> and the |
| 194 | Battery Powered Linux mini-HOWTO, available from | 194 | Battery Powered Linux mini-HOWTO, available from |
| 195 | <http://www.tldp.org/docs.html#howto>. | 195 | <http://www.tldp.org/docs.html#howto>. |
| 196 | 196 | ||