diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 15:56:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:56:23 -0400 |
| commit | cb220c1af49644786944c549518b491d4c654030 (patch) | |
| tree | 9e0f95049de550b0e5f59a5f62ad9089997b6815 /drivers | |
| parent | 1dadb3dadfaa01890fc10df03f0dd03a9f8774b2 (diff) | |
| parent | f6869979bec3cc2efddc7359f30ba37642084fb7 (diff) | |
Merge 'acpi-2.6.12' branch into to-akpm
Diffstat (limited to 'drivers')
| -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 9127760d36c5..81f0eb863a76 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -67,7 +67,7 @@ EXPORT_SYMBOL(acpi_in_debugger); | |||
| 67 | extern char line_buf[80]; | 67 | extern char line_buf[80]; |
| 68 | #endif /*ENABLE_DEBUGGER */ | 68 | #endif /*ENABLE_DEBUGGER */ |
| 69 | 69 | ||
| 70 | int acpi_specific_hotkey_enabled; | 70 | int acpi_specific_hotkey_enabled = TRUE; |
| 71 | EXPORT_SYMBOL(acpi_specific_hotkey_enabled); | 71 | EXPORT_SYMBOL(acpi_specific_hotkey_enabled); |
| 72 | 72 | ||
| 73 | static unsigned int acpi_irq_irq; | 73 | static unsigned int acpi_irq_irq; |
| @@ -1070,11 +1070,11 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); | |||
| 1070 | 1070 | ||
| 1071 | int __init acpi_hotkey_setup(char *str) | 1071 | int __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 |