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 /include | |
| parent | 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 (diff) | |
| parent | 16d752397301b95abaa95cbaf9e785d221872311 (diff) | |
Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thermal.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 06d3e6eb9ca..917707e6151 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -66,8 +66,7 @@ struct thermal_cooling_device { ((long)t-2732+5)/10 : ((long)t-2732-5)/10) #define CELSIUS_TO_KELVIN(t) ((t)*10+2732) -#if defined(CONFIG_HWMON) || \ - (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) +#if defined(CONFIG_THERMAL_HWMON) /* thermal zone devices with the same type share one hwmon device */ struct thermal_hwmon_device { char type[THERMAL_NAME_LENGTH]; @@ -94,8 +93,7 @@ struct thermal_zone_device { struct idr idr; struct mutex lock; /* protect cooling devices list */ struct list_head node; -#if defined(CONFIG_HWMON) || \ - (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) +#if defined(CONFIG_THERMAL_HWMON) struct list_head hwmon_node; struct thermal_hwmon_device *hwmon; struct thermal_hwmon_attr temp_input; /* hwmon sys attr */ |