aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 9127760d36c5..81f0eb863a76 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL(acpi_in_debugger);
67extern char line_buf[80]; 67extern char line_buf[80];
68#endif /*ENABLE_DEBUGGER */ 68#endif /*ENABLE_DEBUGGER */
69 69
70int acpi_specific_hotkey_enabled; 70int acpi_specific_hotkey_enabled = TRUE;
71EXPORT_SYMBOL(acpi_specific_hotkey_enabled); 71EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
72 72
73static unsigned int acpi_irq_irq; 73static unsigned int acpi_irq_irq;
@@ -1070,11 +1070,11 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
1070 1070
1071int __init acpi_hotkey_setup(char *str) 1071int __init acpi_hotkey_setup(char *str)
1072{ 1072{
1073 acpi_specific_hotkey_enabled = TRUE; 1073 acpi_specific_hotkey_enabled = FALSE;
1074 return 1; 1074 return 1;
1075} 1075}
1076 1076
1077__setup("acpi_specific_hotkey", acpi_hotkey_setup); 1077__setup("acpi_generic_hotkey", acpi_hotkey_setup);
1078 1078
1079/* 1079/*
1080 * max_cstate is defined in the base kernel so modules can 1080 * max_cstate is defined in the base kernel so modules can