Merge tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 60fb80b..5c2d13a 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -685,6 +685,20 @@ config SENSORS_LTC2945
          This driver can also be built as a module. If so, the module will
          be called ltc2945.
 
+config SENSORS_LTC2990
+       tristate "Linear Technology LTC2990 (current monitoring mode only)"
+       depends on I2C
+       help
+         If you say yes here you get support for Linear Technology LTC2990
+         I2C System Monitor. The LTC2990 supports a combination of voltage,
+         current and temperature monitoring, but in addition to the Vcc supply
+         voltage and chip temperature, this driver currently only supports
+         reading two currents by measuring two differential voltages across
+         series resistors.
+
+         This driver can also be built as a module. If so, the module will
+         be called ltc2990.
+
 config SENSORS_LTC4151
        tristate "Linear Technology LTC4151"
        depends on I2C
@@ -1127,7 +1141,7 @@ config SENSORS_NTC_THERMISTOR
 
          Currently, this driver supports
          NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, NCP15WL333,
-         and NCP03WF104 from Murata and B57330V2103 from EPCOS.
+         NCP03WF104 and NCP15XH103 from Murata and B57330V2103 from EPCOS.
 
          This driver can also be built as a module.  If so, the module
          will be called ntc-thermistor.
@@ -1176,6 +1190,21 @@ config SENSORS_NCT7904
          This driver can also be built as a module.  If so, the module
          will be called nct7904.
 
+config SENSORS_NSA320
+       tristate "ZyXEL NSA320 and compatible fan speed and temperature sensors"
+       depends on GPIOLIB && OF
+       depends on MACH_KIRKWOOD || COMPILE_TEST
+       help
+         If you say yes here you get support for hardware monitoring
+         for the ZyXEL NSA320 Media Server and other compatible devices
+         (probably the NSA325 and some NSA310 variants).
+
+         The sensor data is taken from a Holtek HT46R065 microcontroller
+         connected to GPIO lines.
+
+         This driver can also be built as a module. If so, the module
+         will be called nsa320-hwmon.
+
 config SENSORS_PCF8591
        tristate "Philips PCF8591 ADC/DAC"
        depends on I2C