aboutsummaryrefslogtreecommitdiff
path: root/Documentation/acpi-hotkey.txt
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-15 15:52:00 -0400
committerLen Brown <len.brown@intel.com>2005-08-15 15:52:00 -0400
commitf6869979bec3cc2efddc7359f30ba37642084fb7 (patch)
tree827629b75e165a7726297955c2916aa75712c66e /Documentation/acpi-hotkey.txt
parent50526df605e7c3e22168664acf726269eae10171 (diff)
parent30e332f3307e9f7718490a706e5ce99f0d3a7b26 (diff)
downloadlinux-linaro-stable-f6869979bec3cc2efddc7359f30ba37642084fb7.tar.gz
Merge to-linus-stable into to-akpm
Diffstat (limited to 'Documentation/acpi-hotkey.txt')
-rw-r--r--Documentation/acpi-hotkey.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index d57b02a4746b..744f1aec6553 100644
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
@@ -34,5 +34,5 @@ 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.
+Note: Use cmdline "acpi_generic_hotkey" to over-ride
+platform-specific with generic driver.