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/power.c | |
| parent | 0c8bd174f0fc131bc9dfab35cd8784f59045da87 (diff) | |
| parent | 2404b8747019184002823dba7d2f0ecf89d802b7 (diff) | |
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/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 32974b575e46..56102eaaa2da 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -995,6 +995,7 @@ void acpi_resume_power_resources(void) mutex_unlock(&power_resource_list_lock); } +#endif void acpi_turn_off_unused_power_resources(void) { @@ -1015,4 +1016,3 @@ void acpi_turn_off_unused_power_resources(void) mutex_unlock(&power_resource_list_lock); } -#endif |