X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fthermal%2FKconfig;h=a86e952ed4ca4de05891b19d54ef185802048bfc;hb=ca6f12c67ed19718cf37d0f531af9438de85b70c;hp=3ab313ed441cc07a4c9ef17ee62c3e325493a32c;hpb=29ea5171cbd08a7ef37e543cbf02447033f0e289;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 3ab313ed441..a86e952ed4c 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -3,9 +3,7 @@
 #
 
 menuconfig THERMAL
-	bool "Generic Thermal sysfs driver"
-	select HWMON
-	default y
+	tristate "Generic Thermal sysfs driver"
 	help
 	  Generic Thermal Sysfs driver offers a generic mechanism for
 	  thermal management. Usually it's made up of one or more thermal
@@ -13,4 +11,13 @@ menuconfig THERMAL
 	  Each thermal zone contains its own temperature, trip points,
 	  cooling devices.
 	  All platforms with ACPI thermal support can use this driver.
-	  If you want this support, you should say Y here.
+	  If you want this support, you should say Y or M here.
+
+config THERMAL_HWMON
+	bool "Hardware monitoring support"
+	depends on HWMON=y || HWMON=THERMAL
+	help
+	  The generic thermal sysfs driver's hardware monitoring support
+	  requires a 2.10.7/3.0.2 or later lm-sensors userspace.
+
+	  Say Y if your user-space is new enough.