Browse Source

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
Linus Torvalds 11 years ago
parent
commit
602456bf16
1 changed files with 2 additions and 0 deletions
  1. 2 0
      drivers/hwmon/Kconfig

+ 2 - 0
drivers/hwmon/Kconfig

@@ -650,6 +650,7 @@ config SENSORS_LM73
 config SENSORS_LM75
 config SENSORS_LM75
 	tristate "National Semiconductor LM75 and compatibles"
 	tristate "National Semiconductor LM75 and compatibles"
 	depends on I2C
 	depends on I2C
+	depends on THERMAL || !THERMAL_OF
 	help
 	help
 	  If you say yes here you get support for one common type of
 	  If you say yes here you get support for one common type of
 	  temperature sensor chip, with models including:
 	  temperature sensor chip, with models including:
@@ -1285,6 +1286,7 @@ config SENSORS_THMC50
 config SENSORS_TMP102
 config SENSORS_TMP102
 	tristate "Texas Instruments TMP102"
 	tristate "Texas Instruments TMP102"
 	depends on I2C
 	depends on I2C
+	depends on THERMAL || !THERMAL_OF
 	help
 	help
 	  If you say yes here you get support for Texas Instruments TMP102
 	  If you say yes here you get support for Texas Instruments TMP102
 	  sensor chips.
 	  sensor chips.