diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 05:30:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-07 05:30:31 -0400 |
| commit | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (patch) | |
| tree | cd49bacdc4ac89a9317501bc9ebe87c3b6320e3e /drivers/thermal/thermal_sys.c | |
| parent | f38bb7de289f5c15e287386d35e9c325f1062c49 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/thermal/thermal_sys.c')
| -rw-r--r-- | drivers/thermal/thermal_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
| 295 | 295 | ||
| 296 | /* Device management */ | 296 | /* Device management */ |
| 297 | 297 | ||
| 298 | #if defined(CONFIG_HWMON) || \ | 298 | #if defined(CONFIG_THERMAL_HWMON) |
| 299 | (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) | 299 | |
| 300 | /* hwmon sys I/F */ | 300 | /* hwmon sys I/F */ |
| 301 | #include <linux/hwmon.h> | 301 | #include <linux/hwmon.h> |
| 302 | static LIST_HEAD(thermal_hwmon_list); | 302 | static LIST_HEAD(thermal_hwmon_list); |