diff options
| author | Len Brown <len.brown@intel.com> | 2008-06-26 01:56:35 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-06-26 01:56:35 -0400 |
| commit | c4e6a2e64e948de42473e9c829181d768b1258c3 (patch) | |
| tree | a0305f7ac7810309d113eb1a542278b8bb9877e3 /drivers | |
| parent | 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 (diff) | |
| parent | 16d752397301b95abaa95cbaf9e785d221872311 (diff) | |
| download | blackbird-op-linux-c4e6a2e64e948de42473e9c829181d768b1258c3.tar.gz blackbird-op-linux-c4e6a2e64e948de42473e9c829181d768b1258c3.zip | |
Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/thermal/thermal_sys.c | 4 |
2 files changed, 11 insertions, 2 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. diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 6098787341f3..fe07462d5947 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -295,8 +295,8 @@ thermal_cooling_device_trip_point_show(struct device *dev, /* Device management */ -#if defined(CONFIG_HWMON) || \ - (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) +#if defined(CONFIG_THERMAL_HWMON) + /* hwmon sys I/F */ #include <linux/hwmon.h> static LIST_HEAD(thermal_hwmon_list); |
