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

[karo-tx-linux.git] / Documentation / acpi-hotkey.txt

diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index 4c115a7bb8262a95080bbc36355ca77fcd3faa2e..744f1aec65535f7d3bbadeedcc4f3e8c508709fb 100644 (file)
--- a/Documentation/acpi-hotkey.txt
+++ b/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_generic_hotkey" to over-ride
+platform-specific with generic driver.