Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index db213fe958a56d0b82a884b31f97cbb01d72841e..32f238f3caea852ad116fa9eab465c945fa0d6e3 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -334,6 +334,16 @@ config SENSORS_DA9052_ADC
          This driver can also be built as module. If so, the module
          will be called da9052-hwmon.
 
+config SENSORS_DA9055
+       tristate "Dialog Semiconductor DA9055 ADC"
+       depends on MFD_DA9055
+       help
+         If you say yes here you get support for ADC on the Dialog
+         Semiconductor DA9055 PMIC.
+
+         This driver can also be built as a module.  If so, the module
+         will be called da9055-hwmon.
+
 config SENSORS_I5K_AMB
        tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
        depends on PCI
@@ -455,7 +465,7 @@ config SENSORS_HIH6130
 
 config SENSORS_CORETEMP
        tristate "Intel Core/Core2/Atom temperature sensor"
-       depends on X86 && PCI
+       depends on X86
        help
          If you say yes here you get support for the temperature
          sensor inside your CPU. Most of the family 6 CPUs
@@ -1106,11 +1116,12 @@ config SENSORS_ADS1015
          will be called ads1015.
 
 config SENSORS_ADS7828
-       tristate "Texas Instruments ADS7828"
+       tristate "Texas Instruments ADS7828 and compatibles"
        depends on I2C
        help
-         If you say yes here you get support for Texas Instruments ADS7828
-         12-bit 8-channel ADC device.
+         If you say yes here you get support for Texas Instruments ADS7828 and
+         ADS7830 8-channel A/D converters. ADS7828 resolution is 12-bit, while
+         it is 8-bit on ADS7830.
 
          This driver can also be built as a module.  If so, the module
          will be called ads7828.