diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 15:52:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:52:00 -0400 |
| commit | f6869979bec3cc2efddc7359f30ba37642084fb7 (patch) | |
| tree | 827629b75e165a7726297955c2916aa75712c66e /drivers/acpi | |
| parent | 50526df605e7c3e22168664acf726269eae10171 (diff) | |
| parent | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (diff) | |
Merge to-linus-stable into to-akpm
Diffstat (limited to 'drivers/acpi')
| -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 56e7cedba919..c212d19443c5 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; |
| @@ -1110,11 +1110,11 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); | |||
| 1110 | int __init | 1110 | int __init |
| 1111 | acpi_hotkey_setup(char *str) | 1111 | acpi_hotkey_setup(char *str) |
| 1112 | { | 1112 | { |
| 1113 | acpi_specific_hotkey_enabled = TRUE; | 1113 | acpi_specific_hotkey_enabled = FALSE; |
| 1114 | return 1; | 1114 | return 1; |
| 1115 | } | 1115 | } |
| 1116 | 1116 | ||
| 1117 | __setup("acpi_specific_hotkey", acpi_hotkey_setup); | 1117 | __setup("acpi_generic_hotkey", acpi_hotkey_setup); |
| 1118 | 1118 | ||
| 1119 | /* | 1119 | /* |
| 1120 | * max_cstate is defined in the base kernel so modules can | 1120 | * max_cstate is defined in the base kernel so modules can |