diff options
-rw-r--r-- | Documentation/thinkpad-acpi.txt | 4 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt index 5b59cf50b2e9..c670363cf5a4 100644 --- a/Documentation/thinkpad-acpi.txt +++ b/Documentation/thinkpad-acpi.txt | |||
@@ -1157,3 +1157,7 @@ Sysfs interface changelog: | |||
1157 | device. | 1157 | device. |
1158 | 0x000200: Hot key support for 32 hot keys, and radio slider switch | 1158 | 0x000200: Hot key support for 32 hot keys, and radio slider switch |
1159 | support. | 1159 | support. |
1160 | 0x010000: Hot keys are now handled by default over the input | ||
1161 | layer, the radio switch generates input event EV_RADIO, | ||
1162 | and the driver enables hot key handling by default in | ||
1163 | the firmware. | ||
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index cfef218c4513..c1e6a01d0857 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define IBM_VERSION "0.14" | 24 | #define IBM_VERSION "0.14" |
25 | #define TPACPI_SYSFS_VERSION 0x000200 | 25 | #define TPACPI_SYSFS_VERSION 0x010000 |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Changelog: | 28 | * Changelog: |