diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-05-13 20:39:58 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-05-13 20:39:58 +0200 |
commit | fd38651716b45f817a542c34cd5336ff372d06e6 (patch) | |
tree | d725c3e4eece61e70c96e91a076b5c71d3eff787 /drivers/acpi/internal.h | |
parent | ACPI: scan: Fix a memory leak in an error handling path (diff) | |
parent | ACPI: PM: Add ACPI ID of Alder Lake Fan (diff) | |
download | linux-fd38651716b45f817a542c34cd5336ff372d06e6.tar.xz linux-fd38651716b45f817a542c34cd5336ff372d06e6.zip |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI: PM: Add ACPI ID of Alder Lake Fan
Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
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 b852cff80287..f973bbe90e5e 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -142,6 +142,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev, int acpi_power_get_inferred_state(struct acpi_device *device, int *state); int acpi_power_on_resources(struct acpi_device *device, int state); int acpi_power_transition(struct acpi_device *device, int state); +void acpi_turn_off_unused_power_resources(void); /* -------------------------------------------------------------------------- Device Power Management |