summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-15 15:56:23 -0400
committerLen Brown <len.brown@intel.com>2005-08-15 15:56:23 -0400
commitcb220c1af49644786944c549518b491d4c654030 (patch)
tree9e0f95049de550b0e5f59a5f62ad9089997b6815 /drivers/acpi
parent1dadb3dadfaa01890fc10df03f0dd03a9f8774b2 (diff)
parentf6869979bec3cc2efddc7359f30ba37642084fb7 (diff)
Merge 'acpi-2.6.12' branch into to-akpm
Diffstat (limited to 'drivers/acpi')
-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 9127760d36c..81f0eb863a7 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -67,7 +67,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;
@@ -1070,11 +1070,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