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

9d1968fd · Zhang Rui · f157f596 · b3ba0206 · 9d1968fd
Commit 9d1968fd authored Jun 18, 2013 by Zhang Rui
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/thermal/Kconfig drivers/thermal/Kconfig +1 -2

No files found.
--- 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