summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2015-03-05 15:27:34 -0800
committerGuenter Roeck <linux@roeck-us.net>2015-03-09 09:59:36 -0700
commit18fd303fea21c98b0b72534e6db47e80d12bf311 (patch)
treed5bf86109e572cf0c3de5fc2ffe32b4dabcf064a /drivers/hwmon
parentde52b049d6d5af635d628d17fcb466d53a9617af (diff)
downloadlinux-stable-18fd303fea21c98b0b72534e6db47e80d12bf311.tar.gz
linux-stable-18fd303fea21c98b0b72534e6db47e80d12bf311.tar.bz2
linux-stable-18fd303fea21c98b0b72534e6db47e80d12bf311.zip
hwmon: (pwm-fan) Fix build when THERMAL=m
Fix build errors when CONFIG_THERMAL=m and SENSORS_PWM_FAN=y by restricting SENSORS_PWM_FAN to 'm' when THERMAL=m. drivers/built-in.o: In function `pwm_fan_remove': pwm-fan.c:(.text+0x22ba58): undefined reference to `thermal_cooling_device_unregister' drivers/built-in.o: In function `pwm_fan_probe': pwm-fan.c:(.text+0x22bebb): undefined reference to `thermal_of_cooling_device_register' pwm-fan.c:(.text+0x22bf11): undefined reference to `thermal_cdev_update' Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Kamil Debski <k.debski@samsung.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 2a5dd697c142..c7db7ded9db7 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1174,6 +1174,7 @@ source drivers/hwmon/pmbus/Kconfig
config SENSORS_PWM_FAN
tristate "PWM fan"
depends on (PWM && OF) || COMPILE_TEST
+ depends on THERMAL || THERMAL=n
help
If you say yes here you get support for fans connected to PWM lines.
The driver uses the generic PWM interface, thus it will work on a