diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-18 20:40:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-11-18 20:40:28 +0100 |
| commit | b49e0015c1bd8ab6c228981ca2eb4ad217ed8223 (patch) | |
| tree | c3780a856bf95a461924f445abc22eb499115d36 /drivers/thermal | |
| parent | thermal: core: Reset previous low and high trip during thermal zone init (diff) | |
| parent | thermal: int340x: Limit Kconfig to 64-bit (diff) | |
| download | linux-b49e0015c1bd8ab6c228981ca2eb4ad217ed8223.tar.xz linux-b49e0015c1bd8ab6c228981ca2eb4ad217ed8223.zip | |
Merge branch 'thermal-int340x'
Merge int340x thermal driver Kconfig fix for 5.16-rc2.
* thermal-int340x:
thermal: int340x: Limit Kconfig to 64-bit
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/intel/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig index 45c31f3d6054..5d046de96a5d 100644 --- a/drivers/thermal/intel/int340x_thermal/Kconfig +++ b/drivers/thermal/intel/int340x_thermal/Kconfig @@ -5,12 +5,12 @@ config INT340X_THERMAL tristate "ACPI INT340X thermal drivers" - depends on X86 && ACPI && PCI + depends on X86_64 && ACPI && PCI select THERMAL_GOV_USER_SPACE select ACPI_THERMAL_REL select ACPI_FAN select INTEL_SOC_DTS_IOSF_CORE - select PROC_THERMAL_MMIO_RAPL if X86_64 && POWERCAP + select PROC_THERMAL_MMIO_RAPL if POWERCAP help Newer laptops and tablets that use ACPI may have thermal sensors and other devices with thermal control capabilities outside the core |