Skip to content

Commit

Permalink
Merge branch 'thermal-int340x'
Browse files Browse the repository at this point in the history
Merge int340x thermal driver Kconfig fix for 5.16-rc2.

* thermal-int340x:
  thermal: int340x: Limit Kconfig to 64-bit
  • Loading branch information
rafaeljw committed Nov 18, 2021
2 parents 99b6331 + 994a04a commit b49e001
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/thermal/intel/int340x_thermal/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b49e001

Please sign in to comment.