Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 6f1d167cb1ea9c2174c403a8a0f0b6b0f1d33bc7..b0a2e4c37e12ff986f5155fdce7529f2b4a1ca8e 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -314,6 +314,16 @@ config SENSORS_DS1621
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 
+config SENSORS_DA9052_ADC
+       tristate "Dialog DA9052/DA9053 ADC"
+       depends on PMIC_DA9052
+       help
+         Say y here to support the ADC found on Dialog Semiconductor
+         DA9052-BC and DA9053-AA/Bx PMICs.
+
+         This driver can also be built as module. If so, the module
+         will be called da9052-hwmon.
+
 config SENSORS_EXYNOS4_TMU
        tristate "Temperature sensor on Samsung EXYNOS4"
        depends on ARCH_EXYNOS4
@@ -433,6 +443,16 @@ config SENSORS_GPIO_FAN
          This driver can also be built as a module.  If so, the module
          will be called gpio-fan.
 
+config SENSORS_HIH6130
+       tristate "Honeywell Humidicon HIH-6130 humidity/temperature sensor"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Honeywell Humidicon
+         HIH-6130 and HIH-6131 Humidicon humidity sensors.
+
+         This driver can also be built as a module.  If so, the module
+         will be called hih6130.
+
 config SENSORS_CORETEMP
        tristate "Intel Core/Core2/Atom temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL