Merge branch 'ec' into test

2008-10-22 23:27:59 -04:00
parent 47bf31adc5 c0ff17720e
commit 0fbb3726f2
4 changed files with 204 additions and 193 deletions
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -101,6 +101,7 @@ extern int acpi_power_nocheck;
   -------------------------------------------------------------------------- */
 #ifdef CONFIG_ACPI_EC
 int acpi_ec_ecdt_probe(void);
+int acpi_boot_ec_enable(void);
 #endif

 /* --------------------------------------------------------------------------