diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-06-18 03:26:49 +0400 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-06-18 03:26:49 +0400 |
| commit | 9d1968fdabc69981ea98ea82082de1cc12a60385 (patch) | |
| tree | 5a5d14ccde0b6d34a0a6ecca1131d0b397dc8008 /drivers/thermal | |
| parent | f157f5964bdc604d8cbf0b71780a0d47ea9f7371 (diff) | |
| parent | b3ba020652d1659ce3c07314fabffbe124fe49dd (diff) | |
| download | linux-9d1968fdabc69981ea98ea82082de1cc12a60385.tar.xz | |
Merge branch 'cpu-package-thermal' of .git into next
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index b13c2bcccb72..e988c81d763c 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -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 |