diff options
| -rw-r--r-- | Documentation/00-INDEX | 2 | ||||
| -rw-r--r-- | Documentation/laptops/00-INDEX | 2 | ||||
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt (renamed from Documentation/thinkpad-acpi.txt) | 0 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 5 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 3de34e581dd..d69b2a3cb45 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -387,8 +387,6 @@ sysrq.txt - info on the magic SysRq key. telephony/ - directory with info on telephony (e.g. voice over IP) support. -thinkpad-acpi.txt - - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. time_interpolators.txt - info on time interpolators. tipar.txt diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX index 2edb5967d35..e806b084e5b 100644 --- a/Documentation/laptops/00-INDEX +++ b/Documentation/laptops/00-INDEX @@ -1,2 +1,4 @@ 00-INDEX - This file +thinkpad-acpi.txt + - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index 6c2477754a2..6c2477754a2 100644 --- a/Documentation/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index c143a86c2ea..85ee4362f2d 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -211,8 +211,9 @@ config THINKPAD_ACPI This is a driver for the IBM and Lenovo ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video output switching, ThinkLight control, UltraBay eject and more. - For more information about this driver see - <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . + For more information about this driver see + <file:Documentation/laptops/thinkpad-acpi.txt> and + <http://ibm-acpi.sf.net/> . This driver was formerly known as ibm-acpi. |