diff --git a/[refs] b/[refs] index 4cda04050c78..43a859f39cc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 670fac79b9dcf16549a4c1f4c0b73c457e53bd7e +refs/heads/master: c2c2e03409f5f5405e79d9d9156202b75cb5b35b diff --git a/trunk/Documentation/acpi-hotkey.txt b/trunk/Documentation/acpi-hotkey.txt index 4c115a7bb826..d57b02a4746b 100644 --- a/trunk/Documentation/acpi-hotkey.txt +++ b/trunk/Documentation/acpi-hotkey.txt @@ -33,3 +33,6 @@ The result of the execution of this aml method is attached to /proc/acpi/hotkey/poll_method, which is dnyamically created. Please use command "cat /proc/acpi/hotkey/polling_method" to retrieve it. + +Note: Use cmdline "acpi_specific_hotkey" to enable legacy platform +specific drivers.