Commit 9cc17134 authored by Linus Torvalds's avatar Linus Torvalds

Merge evo:v2.6/linux into ppc970.osdl.org:/home/torvalds/v2.6/linux

parents 204e9011 415dd276
......@@ -1057,15 +1057,15 @@ __setup("acpi_serialize", acpi_serialize_setup);
* Run-time events on the same GPE this flag is available
* to tell Linux to keep the wake-time GPEs enabled at run-time.
*/
int __init
acpi_wake_gpes_always_on_setup(char *str)
static int __init
acpi_leave_gpes_disabled_setup(char *str)
{
printk(KERN_INFO PREFIX "wake GPEs not disabled\n");
printk(KERN_INFO PREFIX "leave wake GPEs disabled\n");
acpi_gbl_leave_wake_gpes_disabled = FALSE;
acpi_gbl_leave_wake_gpes_disabled = TRUE;
return 1;
}
__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);
__setup("acpi_leave_gpes_disabled", acpi_leave_gpes_disabled_setup);
......@@ -787,7 +787,6 @@ acpi_ut_init_globals (
acpi_gbl_create_osi_method = TRUE;
acpi_gbl_all_methods_serialized = FALSE;
acpi_gbl_leave_wake_gpes_disabled = TRUE;
/* Memory allocation and cache lists */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment