diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 15:56:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:56:23 -0400 |
| commit | cb220c1af49644786944c549518b491d4c654030 (patch) | |
| tree | 9e0f95049de550b0e5f59a5f62ad9089997b6815 /Documentation | |
| parent | 1dadb3dadfaa01890fc10df03f0dd03a9f8774b2 (diff) | |
| parent | f6869979bec3cc2efddc7359f30ba37642084fb7 (diff) | |
Merge 'acpi-2.6.12' branch into to-akpm
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/acpi-hotkey.txt | 4 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt index d57b02a4746..744f1aec655 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. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a998a8c2f95..3d5cd7a09b2 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -159,6 +159,11 @@ running once the system is up. acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT + acpi_generic_hotkey [HW,ACPI] + Allow consolidated generic hotkey driver to + over-ride platform specific driver. + See also Documentation/acpi-hotkey.txt. + ad1816= [HW,OSS] Format: <io>,<irq>,<dma>,<dma2> See also Documentation/sound/oss/AD1816. |