Commit 9d1968fd authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branch 'cpu-package-thermal' of .git into next

parents f157f596 b3ba0206

drivers/thermal/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -171,8 +171,7 @@ config INTEL_POWERCLAMP 




config X86_PKG_TEMP_THERMAL

config X86_PKG_TEMP_THERMAL

	tristate "X86 package temperature thermal driver"

	tristate "X86 package temperature thermal driver"

	depends on THERMAL

	depends on X86_THERMAL_VECTOR

	depends on X86

	select THERMAL_GOV_USER_SPACE

	select THERMAL_GOV_USER_SPACE

	default m

	default m

	help

	help