diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 15:49:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:49:00 -0400 |
| commit | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (patch) | |
| tree | bce3d877276819174962796954c424c0a09be188 | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
| parent | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (diff) | |
| download | kernel_samsung_smdk4412-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.tar.gz kernel_samsung_smdk4412-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.tar.bz2 kernel_samsung_smdk4412-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.zip | |
Merge ../to-linus-stable/
| -rw-r--r-- | Documentation/acpi-hotkey.txt | 3 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
| -rw-r--r-- | drivers/acpi/osl.c | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt index 4c115a7bb82..0acdc80c30c 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 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. diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7289da3c4db..0d11d6e6abd 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -71,7 +71,7 @@ EXPORT_SYMBOL(acpi_in_debugger); extern char line_buf[80]; #endif /*ENABLE_DEBUGGER*/ -int acpi_specific_hotkey_enabled; +int acpi_specific_hotkey_enabled = TRUE; EXPORT_SYMBOL(acpi_specific_hotkey_enabled); static unsigned int acpi_irq_irq; @@ -1162,11 +1162,11 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); int __init acpi_hotkey_setup(char *str) { - acpi_specific_hotkey_enabled = TRUE; + acpi_specific_hotkey_enabled = FALSE; return 1; } -__setup("acpi_specific_hotkey", acpi_hotkey_setup); +__setup("acpi_generic_hotkey", acpi_hotkey_setup); /* * max_cstate is defined in the base kernel so modules can |