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/device_pm.c | |
| parent | 0c8bd174f0fc131bc9dfab35cd8784f59045da87 (diff) | |
| parent | 2404b8747019184002823dba7d2f0ecf89d802b7 (diff) | |
| download | linux-fd38651716b45f817a542c34cd5336ff372d06e6.tar.bz2 | |
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/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 16c0fe8a72a7..d260bc1f3e6e 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1313,6 +1313,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) {"PNP0C0B", }, /* Generic ACPI fan */ {"INT3404", }, /* Fan */ {"INTC1044", }, /* Fan for Tiger Lake generation */ + {"INTC1048", }, /* Fan for Alder Lake generation */ {} }; struct acpi_device *adev = ACPI_COMPANION(dev); |