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

[cascardo/linux.git] / drivers / staging / iio / adc / Kconfig

diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index b9519be..deff899 100644 (file)
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -59,12 +59,12 @@ config AD7816
          temperature sensors and ADC.
 
 config AD7192
-       tristate "Analog Devices AD7190 AD7192 AD7195 ADC driver"
+       tristate "Analog Devices AD7190 AD7192 AD7193 AD7195 ADC driver"
        depends on SPI
        select AD_SIGMA_DELTA
        help
          Say yes here to build support for Analog Devices AD7190,
-         AD7192 or AD7195 SPI analog to digital converters (ADC).
+         AD7192, AD7193 or AD7195 SPI analog to digital converters (ADC).
          If unsure, say N (but it's safe to say "Y").
 
          To compile this driver as a module, choose M here: the
@@ -92,20 +92,6 @@ config LPC32XX_ADC
          activate only one via device tree selection.  Provides direct access
          via sysfs.
 
-config MXS_LRADC
-       tristate "Freescale i.MX23/i.MX28 LRADC"
-       depends on (ARCH_MXS || COMPILE_TEST) && HAS_IOMEM
-       depends on INPUT
-       select STMP_DEVICE
-       select IIO_BUFFER
-       select IIO_TRIGGERED_BUFFER
-       help
-         Say yes here to build support for i.MX23/i.MX28 LRADC convertor
-         built into these chips.
-
-         To compile this driver as a module, choose M here: the
-         module will be called mxs-lradc.
-
 config SPEAR_ADC
        tristate "ST SPEAr ADC"
        depends on PLAT_SPEAR || COMPILE_TEST