diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
| commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
| tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /arch/x86/Kconfig | |
| parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
| parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 237fc128143d..6c70fed0f9a0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1259,7 +1259,7 @@ menuconfig APM | |||
| 1259 | machines with more than one CPU. | 1259 | machines with more than one CPU. |
| 1260 | 1260 | ||
| 1261 | In order to use APM, you will need supporting software. For location | 1261 | In order to use APM, you will need supporting software. For location |
| 1262 | and more information, read <file:Documentation/pm.txt> and the | 1262 | and more information, read <file:Documentation/power/pm.txt> and the |
| 1263 | Battery Powered Linux mini-HOWTO, available from | 1263 | Battery Powered Linux mini-HOWTO, available from |
| 1264 | <http://www.tldp.org/docs.html#howto>. | 1264 | <http://www.tldp.org/docs.html#howto>. |
| 1265 | 1265 | ||