path: root/Documentation
diff options
authorLen Brown <len.brown@intel.com>2009-01-16 14:45:24 -0500
committerLen Brown <len.brown@intel.com>2009-01-16 14:45:24 -0500
commit79491ca416347f9e3c51993db556ba78bef44afa (patch)
treed81ec7210e990164e9cb0737a3a1ae6ea97c9fea /Documentation
parentf1f055f1036a20742608c28ee82139f572dfd031 (diff)
parentaa2fbcec07b0d594808bc3058692395d24eba66e (diff)
Merge branch 'thinkpad-acpi' into release
Diffstat (limited to 'Documentation')
1 files changed, 22 insertions, 3 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 898b4987bb8..41bc99fa188 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -1,7 +1,7 @@
ThinkPad ACPI Extras Driver
- Version 0.21
- May 29th, 2008
+ Version 0.22
+ November 23rd, 2008
Borislav Deianov <borislav@users.sf.net>
Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -16,7 +16,8 @@ supported by the generic Linux ACPI drivers.
This driver used to be named ibm-acpi until kernel 2.6.21 and release
0.13-20070314. It used to be in the drivers/acpi tree, but it was
moved to the drivers/misc tree and renamed to thinkpad-acpi for kernel
-2.6.22, and release 0.14.
+2.6.22, and release 0.14. It was moved to drivers/platform/x86 for
+kernel 2.6.29 and release 0.22.
The driver is named "thinkpad-acpi". In some places, like module
names, "thinkpad_acpi" is used because of userspace issues.
@@ -1412,6 +1413,24 @@ Sysfs notes:
rfkill controller switch "tpacpi_wwan_sw": refer to
Documentation/rfkill.txt for details.
+This feature is marked EXPERIMENTAL because it has not been extensively
+tested and validated in various ThinkPad models yet. The feature may not
+work as expected. USE WITH CAUTION! To use this feature, you need to supply
+the experimental=1 parameter when loading the module.
+sysfs rfkill class: switch "tpacpi_uwb_sw"
+This feature exports an rfkill controller for the UWB device, if one is
+present and enabled in the BIOS.
+Sysfs notes:
+ rfkill controller switch "tpacpi_uwb_sw": refer to
+ Documentation/rfkill.txt for details.
Multiple Commands, Module Parameters