diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-17 14:10:27 +0100 |
| commit | 6a8dd80821c215bc49bf6b108e85c1738c82bf43 (patch) | |
| tree | 3c8a42ca07fd69f9e11e0093e9eb041cad82c1c6 /drivers/acpi/internal.h | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 5993c4670ea2453ef5abb45b312f150e994e6eb9 (diff) | |
| download | linux-3.10-6a8dd80821c215bc49bf6b108e85c1738c82bf43.tar.gz linux-3.10-6a8dd80821c215bc49bf6b108e85c1738c82bf43.tar.bz2 linux-3.10-6a8dd80821c215bc49bf6b108e85c1738c82bf43.zip | |
Merge branch 'acpi-scan' into acpi-pm
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 3c407cdc1ec..e050254ae14 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -67,6 +67,7 @@ struct acpi_ec { extern struct acpi_ec *first_ec; +int acpi_pci_root_init(void); int acpi_ec_init(void); int acpi_ec_ecdt_probe(void); int acpi_boot_ec_enable(void); |