summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-02 11:30:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-02 11:30:57 -0800
commit602456bf169926d331246de9cc5593b962cea0dc (patch)
tree298ebcd418c2cd0a5e37357c3e9718f405f9052b
parent7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5 (diff)
parent632007e2011e5d4269ddb88c0a636b9d9e3c8a13 (diff)
downloadlinux-sh-602456bf169926d331246de9cc5593b962cea0dc.tar.gz
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon kconfig fixes from Jean Delvare. * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors
-rw-r--r--drivers/hwmon/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index f6ca3b21aebd..5ce43d8dfa98 100644
--- 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.