diff options
| -rw-r--r-- | Documentation/laptops/thinkpad-acpi.txt | 6 | ||||
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt index e2ddcdeb61b6..ab4b58eaa7f4 100644 --- a/Documentation/laptops/thinkpad-acpi.txt +++ b/Documentation/laptops/thinkpad-acpi.txt | |||
| @@ -240,9 +240,13 @@ sysfs notes: | |||
| 240 | Returns 0. | 240 | Returns 0. |
| 241 | 241 | ||
| 242 | hotkey_bios_mask: | 242 | hotkey_bios_mask: |
| 243 | DEPRECATED, DON'T USE, WILL BE REMOVED IN THE FUTURE. | ||
| 244 | |||
| 243 | Returns the hot keys mask when thinkpad-acpi was loaded. | 245 | Returns the hot keys mask when thinkpad-acpi was loaded. |
| 244 | Upon module unload, the hot keys mask will be restored | 246 | Upon module unload, the hot keys mask will be restored |
| 245 | to this value. | 247 | to this value. This is always 0x80c, because those are |
| 248 | the hotkeys that were supported by ancient firmware | ||
| 249 | without mask support. | ||
| 246 | 250 | ||
| 247 | hotkey_enable: | 251 | hotkey_enable: |
| 248 | DEPRECATED, WILL BE REMOVED SOON. | 252 | DEPRECATED, WILL BE REMOVED SOON. |
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 679a73b43191..6b667891fc3b 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
| @@ -2544,6 +2544,8 @@ static ssize_t hotkey_bios_mask_show(struct device *dev, | |||
| 2544 | struct device_attribute *attr, | 2544 | struct device_attribute *attr, |
| 2545 | char *buf) | 2545 | char *buf) |
| 2546 | { | 2546 | { |
| 2547 | printk_deprecated_attribute("hotkey_bios_mask", | ||
| 2548 | "This attribute is useless."); | ||
| 2547 | return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_orig_mask); | 2549 | return snprintf(buf, PAGE_SIZE, "0x%08x\n", hotkey_orig_mask); |
| 2548 | } | 2550 | } |
| 2549 | 2551 | ||
