Commit b49e0015 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'thermal-int340x' 

Merge int340x thermal driver Kconfig fix for 5.16-rc2.

* thermal-int340x:
  thermal: int340x: Limit Kconfig to 64-bit
parents 99b63316 994a04a2

drivers/thermal/intel/int340x_thermal/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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