diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-09 23:48:54 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-09 23:48:54 +0200 |
| commit | bd6ac2abc9937eb7613aa194195fd98fe9312b38 (patch) | |
| tree | f7386c717352410ba2fdfc45d1cb1b29aba8f9f2 /drivers/acpi/internal.h | |
| parent | Linux 4.7-rc2 (diff) | |
| parent | ACPI / EC: Fix a boot EC regresion by restoring boot EC support for the DSDT EC (diff) | |
| download | linux-bd6ac2abc9937eb7613aa194195fd98fe9312b38.tar.xz linux-bd6ac2abc9937eb7613aa194195fd98fe9312b38.zip | |
Merge branch 'acpi-ec'
* acpi-ec:
ACPI / EC: Fix a boot EC regresion by restoring boot EC support for the DSDT EC
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 9bb0773d39bf..27cc7feabfe4 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -181,7 +181,7 @@ typedef int (*acpi_ec_query_func) (void *data); int acpi_ec_init(void); int acpi_ec_ecdt_probe(void); -int acpi_boot_ec_enable(void); +int acpi_ec_dsdt_probe(void); void acpi_ec_block_transactions(void); void acpi_ec_unblock_transactions(void); void acpi_ec_unblock_transactions_early(void); |