aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/00-INDEX2
-rw-r--r--Documentation/filesystems/proc.txt4
-rw-r--r--Documentation/laptops/00-INDEX2
-rw-r--r--Documentation/laptops/laptop-mode.txt (renamed from Documentation/laptop-mode.txt)0
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 042073f656e5..1d51c0c57811 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -225,8 +225,6 @@ kprobes.txt
225 - documents the kernel probes debugging feature. 225 - documents the kernel probes debugging feature.
226kref.txt 226kref.txt
227 - docs on adding reference counters (krefs) to kernel objects. 227 - docs on adding reference counters (krefs) to kernel objects.
228laptop-mode.txt
229 - how to conserve battery power using laptop-mode.
230laptops/ 228laptops/
231 - directory with laptop related info and laptop driver documentation. 229 - directory with laptop related info and laptop driver documentation.
232ldm.txt 230ldm.txt
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 5681e2fa1496..518ebe609e2b 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1506,13 +1506,13 @@ laptop_mode
1506----------- 1506-----------
1507 1507
1508laptop_mode is a knob that controls "laptop mode". All the things that are 1508laptop_mode is a knob that controls "laptop mode". All the things that are
1509controlled by this knob are discussed in Documentation/laptop-mode.txt. 1509controlled by this knob are discussed in Documentation/laptops/laptop-mode.txt.
1510 1510
1511block_dump 1511block_dump
1512---------- 1512----------
1513 1513
1514block_dump enables block I/O debugging when set to a nonzero value. More 1514block_dump enables block I/O debugging when set to a nonzero value. More
1515information on block I/O debugging is in Documentation/laptop-mode.txt. 1515information on block I/O debugging is in Documentation/laptops/laptop-mode.txt.
1516 1516
1517swap_token_timeout 1517swap_token_timeout
1518------------------ 1518------------------
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index 729c2c062e10..ee5692b26dd4 100644
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -2,6 +2,8 @@
2 - This file 2 - This file
3acer-wmi.txt 3acer-wmi.txt
4 - information on the Acer Laptop WMI Extras driver. 4 - information on the Acer Laptop WMI Extras driver.
5laptop-mode.txt
6 - how to conserve battery power using laptop-mode.
5sony-laptop.txt 7sony-laptop.txt
6 - Sony Notebook Control Driver (SNC) Readme. 8 - Sony Notebook Control Driver (SNC) Readme.
7sonypi.txt 9sonypi.txt
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptops/laptop-mode.txt
index eeedee11c8c2..eeedee11c8c2 100644
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptops/laptop-mode.txt