diff options
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 bdd9f37f8101..cb16cc11fee8 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -71,7 +71,7 @@ EXPORT_SYMBOL(acpi_in_debugger); | |||
| 71 | extern char line_buf[80]; | 71 | extern char line_buf[80]; |
| 72 | #endif /*ENABLE_DEBUGGER*/ | 72 | #endif /*ENABLE_DEBUGGER*/ |
| 73 | 73 | ||
| 74 | int acpi_specific_hotkey_enabled; | 74 | int acpi_specific_hotkey_enabled = TRUE; |
| 75 | EXPORT_SYMBOL(acpi_specific_hotkey_enabled); | 75 | EXPORT_SYMBOL(acpi_specific_hotkey_enabled); |
| 76 | 76 | ||
| 77 | static unsigned int acpi_irq_irq; | 77 | static unsigned int acpi_irq_irq; |
| @@ -1158,11 +1158,11 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); | |||
| 1158 | int __init | 1158 | int __init |
| 1159 | acpi_hotkey_setup(char *str) | 1159 | acpi_hotkey_setup(char *str) |
| 1160 | { | 1160 | { |
| 1161 | acpi_specific_hotkey_enabled = TRUE; | 1161 | acpi_specific_hotkey_enabled = FALSE; |
| 1162 | return 1; | 1162 | return 1; |
| 1163 | } | 1163 | } |
| 1164 | 1164 | ||
| 1165 | __setup("acpi_specific_hotkey", acpi_hotkey_setup); | 1165 | __setup("acpi_generic_hotkey", acpi_hotkey_setup); |
| 1166 | 1166 | ||
| 1167 | /* | 1167 | /* |
| 1168 | * max_cstate is defined in the base kernel so modules can | 1168 | * max_cstate is defined in the base kernel so modules can |
