Merge branch 'cpu-package-thermal' of .git into next
This commit is contained in:
commit
9d1968fdab
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue