Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[deliverable/linux.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b2aa13bd89dc23feb2b1c097f87b20a2a69923e5..eaf2f916d48c52c0315baef4f6784b90f59d7df2 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -486,6 +486,18 @@ config SENSORS_FSCHMD
          This driver can also be built as a module.  If so, the module
          will be called fschmd.
 
+config SENSORS_FTSTEUTATES
+       tristate "Fujitsu Technology Solutions sensor chip Teutates"
+       depends on I2C && WATCHDOG
+       select WATCHDOG_CORE
+       help
+         If you say yes here you get support for the Fujitsu Technology
+         Solutions (FTS) sensor chip "Teutates" including support for
+         the integrated watchdog.
+
+         This driver can also be built as a module. If so, the module
+         will be called ftsteutates.
+
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C
@@ -645,8 +657,8 @@ config SENSORS_JC42
          temperature sensors, which are used on many DDR3 memory modules for
          mobile devices and servers.  Support will include, but not be limited
          to, ADT7408, AT30TS00, CAT34TS02, CAT6095, MAX6604, MCP9804, MCP9805,
-         MCP98242, MCP98243, MCP98244, MCP9843, SE97, SE98, STTS424(E),
-         STTS2002, STTS3000, TSE2002, TSE2004, TS3000, and TS3001.
+         MCP9808, MCP98242, MCP98243, MCP98244, MCP9843, SE97, SE98,
+         STTS424(E), STTS2002, STTS3000, TSE2002, TSE2004, TS3000, and TS3001.
 
          This driver can also be built as a module.  If so, the module
          will be called jc42.
@@ -958,6 +970,7 @@ config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
        depends on THERMAL || !THERMAL_OF
+       select REGMAP_I2C
        help
          If you say yes here you get support for one common type of
          temperature sensor chip, with models including:
@@ -1560,6 +1573,7 @@ config SENSORS_TMP102
        tristate "Texas Instruments TMP102"
        depends on I2C
        depends on THERMAL || !THERMAL_OF
+       select REGMAP_I2C
        help
          If you say yes here you get support for Texas Instruments TMP102
          sensor chips.