summaryrefslogtreecommitdiff
path: root/Documentation/acpi-hotkey.txt
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 16:12:20 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 16:12:20 +0400
commit165415f700b0c77fa1f8db6198f48582639adf78 (patch)
tree088e305b0b5b0c6753072e13be1177824c3ed59d /Documentation/acpi-hotkey.txt
parentc324b44c34050cf2a9b58830e11c974806bd85d8 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
downloadlinux-165415f700b0c77fa1f8db6198f48582639adf78.tar.xz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'Documentation/acpi-hotkey.txt')
-rw-r--r--Documentation/acpi-hotkey.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index 0acdc80c30c2..744f1aec6553 100644
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
@@ -35,4 +35,4 @@ created. Please use command "cat /proc/acpi/hotkey/polling_method"
to retrieve it.
Note: Use cmdline "acpi_generic_hotkey" to over-ride
-loading any platform specific drivers.
+platform-specific with generic driver.