diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 21:49:00 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 21:49:00 +0200 |
| commit | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (patch) | |
| tree | bce3d877276819174962796954c424c0a09be188 /Documentation | |
| parent | Revert PCIBIOS_MIN_IO changes for 2.6.13 (diff) | |
| parent | [ACPI] re-enable platform-specific hotkey drivers by default (diff) | |
| download | linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.tar.xz linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.zip | |
Merge ../to-linus-stable/
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/acpi-hotkey.txt | 3 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt index 4c115a7bb826..0acdc80c30c2 100644 --- 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 +loading any platform specific drivers. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a998a8c2f95b..3d5cd7a09b2f 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. |