Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[sfrench/cifs-2.6.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 9ddcd5db039be3f3024983640832577e67eee417..5937030f0444deeeba1a1d559e4a401f63dff968 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -195,6 +195,13 @@ config EXYNOS_ADC
          To compile this driver as a module, choose M here: the module will be
          called exynos_adc.
 
+config FSL_MX25_ADC
+       tristate "Freescale MX25 ADC driver"
+       depends on MFD_MX25_TSADC
+       help
+         Generic Conversion Queue driver used for general purpose ADC in the
+         MX25. This driver supports single measurements using the MX25 ADC.
+
 config HI8435
        tristate "Holt Integrated Circuits HI-8435 threshold detector"
        select IIO_TRIGGERED_EVENT