diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-23 01:07:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-23 01:07:10 -0400 |
| commit | 1410b0a7ad3178968c120bad726976fb48ab336b (patch) | |
| tree | 1a2178acfeca2b9a33091e562f84f53bbcec9186 /drivers/acpi/osl.c | |
| parent | e4deec6304cbd5fd08bf573eccc68787945071c2 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
| download | kernel_samsung_smdk4412-1410b0a7ad3178968c120bad726976fb48ab336b.zip kernel_samsung_smdk4412-1410b0a7ad3178968c120bad726976fb48ab336b.tar.gz kernel_samsung_smdk4412-1410b0a7ad3178968c120bad726976fb48ab336b.tar.bz2 | |
Merge /spare/repo/linux-2.6/
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 7289da3..0d11d6e 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 |