tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 602456bf 7b383bef

options
unified split
Changed files
+2
drivers
hwmon
Kconfig
+2
drivers/hwmon/Kconfig
··· 650 650 config SENSORS_LM75 651 651 tristate "National Semiconductor LM75 and compatibles" 652 652 depends on I2C 653 + depends on THERMAL || !THERMAL_OF 653 654 help 654 655 If you say yes here you get support for one common type of 655 656 temperature sensor chip, with models including: ··· 1286 1285 config SENSORS_TMP102 1287 1286 tristate "Texas Instruments TMP102" 1288 1287 depends on I2C 1288 + depends on THERMAL || !THERMAL_OF 1289 1289 help 1290 1290 If you say yes here you get support for Texas Instruments TMP102 1291 1291 sensor chips.