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

[linux-2.6-block.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index af4aea7b20f950bea5c359247841d00eff0d2a02..5937030f0444deeeba1a1d559e4a401f63dff968 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -134,6 +134,7 @@ config AT91_ADC
 config AT91_SAMA5D2_ADC
        tristate "Atmel AT91 SAMA5D2 ADC"
        depends on ARCH_AT91 || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          Say yes here to build support for Atmel SAMA5D2 ADC which is
          available on SAMA5D2 SoC family.
@@ -241,6 +242,16 @@ config LP8788_ADC
          To compile this driver as a module, choose M here: the module will be
          called lp8788_adc.
 
+config LPC18XX_ADC
+       tristate "NXP LPC18xx ADC driver"
+       depends on ARCH_LPC18XX || COMPILE_TEST
+       depends on OF && HAS_IOMEM
+       help
+         Say yes here to build support for NXP LPC18XX ADC.
+
+         To compile this driver as a module, choose M here: the module will be
+         called lpc18xx_adc.
+
 config MAX1027
        tristate "Maxim max1027 ADC driver"
        depends on SPI