diff options
author | Luming Yu <luming.yu@intel.com> | 2005-08-12 06:31:00 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-15 21:46:58 +0200 |
commit | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (patch) | |
tree | 39054cfaf058a369f2b75bd89265e83522c02b49 /Documentation | |
parent | [ACPI] delete Warning: Encountered executable code at module level, [AE_NOT_C... (diff) | |
download | linux-30e332f3307e9f7718490a706e5ce99f0d3a7b26.tar.xz linux-30e332f3307e9f7718490a706e5ce99f0d3a7b26.zip |
[ACPI] re-enable platform-specific hotkey drivers by default
When both platform-specific and generic drivers exist,
enable generic over-ride with "acpi_generic_hotkey".
http://bugzilla.kernel.org/show_bug.cgi?id=4953
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
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 4924d387a657..3c684ef6352e 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. |