diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-18 21:19:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-18 21:19:37 +0100 |
| commit | 432c19a8d965aa0123e0a81492492a7cb1da5257 (patch) | |
| tree | 184f91715d30329bb498ac5c3bc7f41211cc2a35 /drivers/thermal | |
| parent | Merge tag 's390-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390... (diff) | |
| parent | thermal: int340x: Support Alder Lake (diff) | |
| download | linux-432c19a8d965aa0123e0a81492492a7cb1da5257.tar.xz linux-432c19a8d965aa0123e0a81492492a7cb1da5257.zip | |
Merge tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fixlet from Daniel Lezcano:
"A trivial change which fell through the cracks:
Add Alder Lake support ACPI ids (Srinivas Pandruvada)"
* tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
thermal: int340x: Support Alder Lake
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 | ||||
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 0966551cbaaa..823354a1a91a 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -584,6 +584,7 @@ static int int3400_thermal_remove(struct platform_device *pdev) static const struct acpi_device_id int3400_thermal_match[] = { {"INT3400", 0}, {"INTC1040", 0}, + {"INTC1041", 0}, {} }; diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c index ec1d58c4ceaa..c3c4c4d34542 100644 --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c @@ -284,6 +284,7 @@ static int int3403_remove(struct platform_device *pdev) static const struct acpi_device_id int3403_device_ids[] = { {"INT3403", 0}, {"INTC1043", 0}, + {"INTC1046", 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, int3403_device_ids); |