diff options
| author | Zhang Rui | 2014-10-17 08:30:58 +0200 |
|---|---|---|
| committer | Zhang Rui | 2014-10-17 08:30:58 +0200 |
| commit | 6ceaf58abe25e86292152005c51169796bad3407 (patch) | |
| tree | e97a032bc9dc63da9939136bd32ed5e0ad0f09bc /include/acpi/acpi_bus.h | |
| parent | Merge branch 'thermal-core-fix' of .git into next (diff) | |
| parent | Thermal: int340x thermal: select ACPI fan driver (diff) | |
| download | kernel-qcow2-linux-6ceaf58abe25e86292152005c51169796bad3407.tar.gz kernel-qcow2-linux-6ceaf58abe25e86292152005c51169796bad3407.tar.xz kernel-qcow2-linux-6ceaf58abe25e86292152005c51169796bad3407.zip | |
Merge branch 'int340x-thermal' of .git into next
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index bcfd808b1098..6ca32812f3da 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -435,6 +435,7 @@ int acpi_device_set_power(struct acpi_device *device, int state); int acpi_bus_init_power(struct acpi_device *device); int acpi_device_fix_up_power(struct acpi_device *device); int acpi_bus_update_power(acpi_handle handle, int *state_p); +int acpi_device_update_power(struct acpi_device *device, int *state_p); bool acpi_bus_power_manageable(acpi_handle handle); #ifdef CONFIG_PM |