diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:06:16 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:06:16 -0400 |
| commit | 596fb7ae462f5c82a1d663fe04f8c98464c963c9 (patch) | |
| tree | 0853612306257f388a4cecdbd3043162a5d42251 /Documentation | |
| parent | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (diff) | |
| parent | de4c8cc7bddd9c43dc1b85517ab445ffa8163058 (diff) | |
Merge branch 'thinkpad' into release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index e2ddcdeb61b..6d03487ef1c 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt @@ -219,7 +219,7 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file: echo 0xffffffff > /proc/acpi/ibm/hotkey -- enable all hot keys echo 0 > /proc/acpi/ibm/hotkey -- disable all possible hot keys ... any other 8-hex-digit mask ... - echo reset > /proc/acpi/ibm/hotkey -- restore the original mask + echo reset > /proc/acpi/ibm/hotkey -- restore the recommended mask The following commands have been deprecated and will cause the kernel to log a warning: @@ -240,9 +240,13 @@ sysfs notes: Returns 0. hotkey_bios_mask: + DEPRECATED, DON'T USE, WILL BE REMOVED IN THE FUTURE. + Returns the hot keys mask when thinkpad-acpi was loaded. Upon module unload, the hot keys mask will be restored - to this value. + to this value. This is always 0x80c, because those are + the hotkeys that were supported by ancient firmware + without mask support. hotkey_enable: DEPRECATED, WILL BE REMOVED SOON. |