diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:27:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:27:59 -0400 |
| commit | 0fbb3726f246aadd1bebc01114100b6e69afa5b9 (patch) | |
| tree | 87e0ca2d5904df9e12e8b7b1d2b303b17758c70a /include/acpi | |
| parent | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (diff) | |
| parent | c0ff17720ec5f42205b3d2ca03a18da0a8272976 (diff) | |
Merge branch 'ec' into test
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index a35c9597d5b1..cf04c6011c2a 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
| @@ -101,6 +101,7 @@ extern int acpi_power_nocheck; | |||
| 101 | -------------------------------------------------------------------------- */ | 101 | -------------------------------------------------------------------------- */ |
| 102 | #ifdef CONFIG_ACPI_EC | 102 | #ifdef CONFIG_ACPI_EC |
| 103 | int acpi_ec_ecdt_probe(void); | 103 | int acpi_ec_ecdt_probe(void); |
| 104 | int acpi_boot_ec_enable(void); | ||
| 104 | #endif | 105 | #endif |
| 105 | 106 | ||
| 106 | /* -------------------------------------------------------------------------- | 107 | /* -------------------------------------------------------------------------- |