aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2013-06-17 12:27:17 -0700
committerZhang Rui <rui.zhang@intel.com>2013-06-18 07:26:24 +0800
commitb3ba020652d1659ce3c07314fabffbe124fe49dd (patch)
tree0e4e463de7f47288b6f231b5bd8a89068cfbaae9
parent23be63f48d928cd5a21db58f73c731357e895250 (diff)
downloadkernel_goldelico_gta04-b3ba020652d1659ce3c07314fabffbe124fe49dd.zip
kernel_goldelico_gta04-b3ba020652d1659ce3c07314fabffbe124fe49dd.tar.gz
kernel_goldelico_gta04-b3ba020652d1659ce3c07314fabffbe124fe49dd.tar.bz2
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 245831c..2ff5cb9 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