Skip to content

Commit

Permalink
Merge branch 'cpu-package-thermal' of .git into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhang Rui committed Jun 17, 2013
2 parents f157f59 + b3ba020 commit 9d1968f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/thermal/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ config INTEL_POWERCLAMP

config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
depends on THERMAL
depends on X86
depends on X86_THERMAL_VECTOR
select THERMAL_GOV_USER_SPACE
default m
help
Expand Down

0 comments on commit 9d1968f

Please sign in to comment.