Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 50146bb69833fe99d0b852a57d39e3a7c9e241a7..842b0043ad9477160194a7c7a94b03f7ab06d5a1 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -848,6 +848,16 @@ config SENSORS_MAX6697
          This driver can also be built as a module.  If so, the module
          will be called max6697.
 
          This driver can also be built as a module.  If so, the module
          will be called max6697.
 

+config SENSORS_MAX31790
+       tristate "Maxim MAX31790 sensor chip"
+       depends on I2C
+       help
+         If you say yes here you get support for 6-Channel PWM-Output
+         Fan RPM Controller.
+
+         This driver can also be built as a module.  If so, the module
+         will be called max31790.
+

 config SENSORS_HTU21
        tristate "Measurement Specialties HTU21D humidity/temperature sensors"
        depends on I2C
 config SENSORS_HTU21
        tristate "Measurement Specialties HTU21D humidity/temperature sensors"
        depends on I2C