Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e19cf8eb6ccfa10f2ed1414387922d16eebb24ac..c57e530d07c75d1bd8472f22370274e86d3022ff 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -446,6 +446,16 @@ config SENSORS_IT87
          This driver can also be built as a module.  If so, the module
          will be called it87.
 
+config SENSORS_JZ4740
+       tristate "Ingenic JZ4740 SoC ADC driver"
+       depends on MACH_JZ4740 && MFD_JZ4740_ADC
+       help
+         If you say yes here you get support for reading adc values from the ADCIN
+         pin on Ingenic JZ4740 SoC based boards.
+
+         This driver can also be build as a module. If so, the module will be
+         called jz4740-hwmon.
+
 config SENSORS_LM63
        tristate "National Semiconductor LM63 and LM64"
        depends on I2C