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 /drivers/acpi/osl.c | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
| parent | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (diff) | |
| download | talos-op-linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.tar.gz talos-op-linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.zip | |
Merge ../to-linus-stable/
Diffstat (limited to 'drivers/acpi/osl.c')
| -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 7289da3c4db6..0d11d6e6abd6 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 |
