diff options
| author | Luming Yu <luming.yu@intel.com> | 2005-08-12 00:31:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:46:58 -0400 |
| commit | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (patch) | |
| tree | 39054cfaf058a369f2b75bd89265e83522c02b49 /drivers | |
| parent | d4ab025b73a2d10548e17765eb76f3b7351dc611 (diff) | |
| download | linux-3.10-30e332f3307e9f7718490a706e5ce99f0d3a7b26.tar.gz linux-3.10-30e332f3307e9f7718490a706e5ce99f0d3a7b26.tar.bz2 linux-3.10-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 'drivers')
| -rw-r--r-- | drivers/acpi/osl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bdd9f37f810..cb16cc11fee 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; @@ -1158,11 +1158,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 |