summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2013-06-17 12:27:17 -0700
committerMyungJoo Ham <myungjoo.ham@samsung.com>2013-11-15 13:52:45 +0900
commit000deb989617d380a652531d9a16204d14bb1abf (patch)
tree200860e619c44c694695502d301f2f49710892e5
parente4187ca8ee54d3e3274ab28857f2315ffa24b386 (diff)
downloadlinux-3.10-000deb989617d380a652531d9a16204d14bb1abf.tar.gz
linux-3.10-000deb989617d380a652531d9a16204d14bb1abf.tar.bz2
linux-3.10-000deb989617d380a652531d9a16204d14bb1abf.zip
thermal: fix x86_pkg_temp_thermal.c build and Kconfig
Fix build error in x86_pkg_temp_thermal.c. It requires that X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol, since it depends on X86_MCE (indirectly). Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block, so remove that duplicated dependency. ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined! ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined! Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Borislav Petkov <bp@suse.de> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/thermal/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index fe04d56e8a6..a60e1ce1bcb 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