Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6-omap-h63xx.git] / Documentation / acpi-hotkey.txt

diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index d57b02a4746b0f0e621b9014a1d68ffdd064c3df..744f1aec65535f7d3bbadeedcc4f3e8c508709fb 100644 (file)
--- 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.