Merge branch 'ec' into test

git-mirror · Oct 23, 2008 · 0fbb372 · 0fbb372
2 parents 47bf31a + c0ff177
commit 0fbb372
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 187 deletions.
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
@@ -793,6 +793,12 @@ static int __init acpi_bus_init(void)
 		goto error1;
 	}
 
+	/*
+	 * Maybe EC region is required at bus_scan/acpi_get_devices. So it
+	 * is necessary to enable it as early as possible.
+	 */
+	acpi_boot_ec_enable();
+
 	printk(KERN_INFO PREFIX "Interpreter enabled\n");
 
 	/* Initialize sleep structures */