Merge branch 'for_3.14-rcx/clk-fixes' 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 52d548f1dc1ddbccceedab0c7f2bf9e1d53766f2..5ce43d8dfa98e635f039eaad29b5ec4627557b78 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -573,8 +573,8 @@ config SENSORS_IT87
        help
          If you say yes here you get support for ITE IT8705F, IT8712F,
          IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E,
-         IT8771E, IT8772E, IT8782F, and IT8783E/F sensor chips, and the
-         SiS950 clone.
+         IT8771E, IT8772E, IT8782F, IT8783E/F and IT8603E sensor chips,
+         and the SiS950 clone.
 
          This driver can also be built as a module.  If so, the module
          will be called it87.
@@ -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.