diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:22:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 15:22:30 -0400 |
| commit | 0acbbee440fadf45164cc9537ee7d528d045f2d6 (patch) | |
| tree | cbdb4d3f7fa97fd657f2e8e3489591dc444b9f23 /drivers/thermal/thermal_sys.c | |
| parent | 535e49f48e2fc95a6de8efb366ca8af35d424642 (diff) | |
| parent | c4e6a2e64e948de42473e9c829181d768b1258c3 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
ACPI: don't walk tables if ACPI was disabled
thermal: Create CONFIG_THERMAL_HWMON=n
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); |