summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-06-26 01:56:35 -0400
committerLen Brown <len.brown@intel.com>2008-06-26 01:56:35 -0400
commitc4e6a2e64e948de42473e9c829181d768b1258c3 (patch)
treea0305f7ac7810309d113eb1a542278b8bb9877e3 /drivers/thermal/Kconfig
parent816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 (diff)
parent16d752397301b95abaa95cbaf9e785d221872311 (diff)
downloadblackbird-op-linux-c4e6a2e64e948de42473e9c829181d768b1258c3.tar.gz
blackbird-op-linux-c4e6a2e64e948de42473e9c829181d768b1258c3.zip
Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release
Diffstat (limited to 'drivers/thermal/Kconfig')
-rw-r--r--drivers/thermal/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 4b628526df09..a86e952ed4ca 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -12,3 +12,12 @@ menuconfig THERMAL
cooling devices.
All platforms with ACPI thermal support can use this driver.
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.
OpenPOWER on IntegriCloud