Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy

[~andy/linux] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 0428e8a74b19253c1ab5da323d9026fe3e9a23c7..e989f7fd645b0d78322ba1431acf4c3f01c220b3 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -348,11 +348,16 @@ config SENSORS_DS620
          will be called ds620.
 
 config SENSORS_DS1621
-       tristate "Dallas Semiconductor DS1621 and DS1625"
+       tristate "Dallas Semiconductor DS1621 and compatibles"
        depends on I2C
        help
-         If you say yes here you get support for Dallas Semiconductor
-         DS1621 and DS1625 sensor chips.
+         If you say yes here you get support for Dallas Semiconductor/Maxim
+         Integrated DS1621 sensor chips and compatible models including:
+
+         - Dallas Semiconductor DS1625
+         - Maxim Integrated DS1631
+         - Maxim Integrated DS1721
+         - Maxim Integrated DS1731
 
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
@@ -456,6 +461,16 @@ config SENSORS_G760A
          This driver can also be built as a module.  If so, the module
          will be called g760a.
 
+config SENSORS_G762
+       tristate "GMT G762 and G763"
+       depends on I2C
+       help
+         If you say yes here you get support for Global Mixed-mode
+         Technology Inc G762 and G763 fan speed PWM controller chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called g762.
+
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C