diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 18:03:30 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 18:03:30 -0400 |
| commit | 223176bc722a7bf519904180e956292ae1d1e819 (patch) | |
| tree | 75b84d09c4b6eed81e537a4e587236f05faa5b7d /Documentation/acpi-hotkey.txt | |
| parent | 7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
Merge branch 'master' of /usr/src/linux-2.6
Diffstat (limited to 'Documentation/acpi-hotkey.txt')
| -rw-r--r-- | Documentation/acpi-hotkey.txt | 2 |
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" | |||
| 35 | to retrieve it. | 35 | to retrieve it. |
| 36 | 36 | ||
| 37 | Note: Use cmdline "acpi_generic_hotkey" to over-ride | 37 | Note: Use cmdline "acpi_generic_hotkey" to over-ride |
| 38 | loading any platform specific drivers. | 38 | platform-specific with generic driver. |