Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/kernel/linux-rpi.git] / drivers / iio / adc / Kconfig

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 961b8d0..fe822a1 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -125,4 +125,18 @@ config TI_ADC081C
          This driver can also be built as a module. If so, the module will be
          called ti-adc081c.
 
+config TI_AM335X_ADC
+       tristate "TI's ADC driver"
+       depends on MFD_TI_AM335X_TSCADC
+       help
+         Say yes here to build support for Texas Instruments ADC
+         driver which is also a MFD client.
+
+config VIPERBOARD_ADC
+       tristate "Viperboard ADC support"
+       depends on MFD_VIPERBOARD && USB
+       help
+         Say yes here to access the ADC part of the Nano River
+         Technologies Viperboard.
+
 endmenu