Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 9b3f612000009fc9239d9f549b4a0eab8cd13498..a86e952ed4ca4de05891b19d54ef185802048bfc 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -3,13 +3,21 @@
 #
 
 menuconfig THERMAL
 #
 
 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.
        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.
          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.