aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/00-INDEX2
-rw-r--r--Documentation/laptops/00-INDEX2
-rw-r--r--Documentation/laptops/thinkpad-acpi.txt (renamed from Documentation/thinkpad-acpi.txt)0
-rw-r--r--drivers/misc/Kconfig5
4 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 3de34e581ddb..d69b2a3cb455 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -387,8 +387,6 @@ sysrq.txt
387 - info on the magic SysRq key. 387 - info on the magic SysRq key.
388telephony/ 388telephony/
389 - directory with info on telephony (e.g. voice over IP) support. 389 - directory with info on telephony (e.g. voice over IP) support.
390thinkpad-acpi.txt
391 - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver.
392time_interpolators.txt 390time_interpolators.txt
393 - info on time interpolators. 391 - info on time interpolators.
394tipar.txt 392tipar.txt
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index 2edb5967d35c..e806b084e5b2 100644
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -1,2 +1,4 @@
100-INDEX 100-INDEX
2 - This file 2 - This file
3thinkpad-acpi.txt
4 - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver.
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 6c2477754a2a..6c2477754a2a 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c143a86c2ea6..85ee4362f2db 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -211,8 +211,9 @@ config THINKPAD_ACPI
211 This is a driver for the IBM and Lenovo ThinkPad laptops. It adds 211 This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
212 support for Fn-Fx key combinations, Bluetooth control, video 212 support for Fn-Fx key combinations, Bluetooth control, video
213 output switching, ThinkLight control, UltraBay eject and more. 213 output switching, ThinkLight control, UltraBay eject and more.
214 For more information about this driver see 214 For more information about this driver see
215 <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . 215 <file:Documentation/laptops/thinkpad-acpi.txt> and
216 <http://ibm-acpi.sf.net/> .
216 217
217 This driver was formerly known as ibm-acpi. 218 This driver was formerly known as ibm-acpi.
218 219