Merge tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index f6ca3b21aebd989bcdadeb749e4250134dfbe16e..5ce43d8dfa98e635f039eaad29b5ec4627557b78 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -650,6 +650,7 @@ config SENSORS_LM73
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
+       depends on THERMAL || !THERMAL_OF
        help
          If you say yes here you get support for one common type of
          temperature sensor chip, with models including:
@@ -1285,6 +1286,7 @@ config SENSORS_THMC50
 config SENSORS_TMP102
        tristate "Texas Instruments TMP102"
        depends on I2C
+       depends on THERMAL || !THERMAL_OF
        help
          If you say yes here you get support for Texas Instruments TMP102
          sensor chips.