X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fthermal%2FKconfig;h=a86e952ed4ca4de05891b19d54ef185802048bfc;hb=42a17ad2762f465d291c3bc0b6ed2b3738f65481;hp=9b3f612000009fc9239d9f549b4a0eab8cd13498;hpb=203d3d4aa482339b4816f131f713e1b8ee37f6dd;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 9b3f612..a86e952 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -3,13 +3,21 @@
 #
 
 menuconfig THERMAL
-	bool "Generic Thermal sysfs driver"
-	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
 	  zone and cooling device.
-	  each thermal zone contains its own temperature, trip points,
+	  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.