diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 14:30:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-02 14:30:57 -0500 |
commit | 602456bf169926d331246de9cc5593b962cea0dc (patch) | |
tree | 298ebcd418c2cd0a5e37357c3e9718f405f9052b | |
parent | 7b383bef25e493cc4f047e44ebd6c3ccfd6d1cc5 (diff) | |
parent | 632007e2011e5d4269ddb88c0a636b9d9e3c8a13 (diff) |
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/Kconfig | 2 |
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 | |||
650 | config SENSORS_LM75 | 650 | config SENSORS_LM75 |
651 | tristate "National Semiconductor LM75 and compatibles" | 651 | tristate "National Semiconductor LM75 and compatibles" |
652 | depends on I2C | 652 | depends on I2C |
653 | depends on THERMAL || !THERMAL_OF | ||
653 | help | 654 | help |
654 | If you say yes here you get support for one common type of | 655 | If you say yes here you get support for one common type of |
655 | temperature sensor chip, with models including: | 656 | temperature sensor chip, with models including: |
@@ -1285,6 +1286,7 @@ config SENSORS_THMC50 | |||
1285 | config SENSORS_TMP102 | 1286 | config SENSORS_TMP102 |
1286 | tristate "Texas Instruments TMP102" | 1287 | tristate "Texas Instruments TMP102" |
1287 | depends on I2C | 1288 | depends on I2C |
1289 | depends on THERMAL || !THERMAL_OF | ||
1288 | help | 1290 | help |
1289 | If you say yes here you get support for Texas Instruments TMP102 | 1291 | If you say yes here you get support for Texas Instruments TMP102 |
1290 | sensor chips. | 1292 | sensor chips. |