Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/jic23/iio into staging-next
git-mirror · Jul 6, 2012 · c01ef02 · c01ef02
2 parents b600c5b + cf82cb8
commit c01ef02
Show file tree

Hide file tree

Showing 19 changed files with 843 additions and 317 deletions.
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
@@ -3,6 +3,16 @@
 #
 menu "Analog to digital converters"
 
+config AD7266
+	tristate "Analog Devices AD7265/AD7266 ADC driver"
+	depends on SPI_MASTER
+	select IIO_BUFFER
+	select IIO_TRIGGER
+	select IIO_TRIGGERED_BUFFER
+	help
+	  Say yes here to build support for Analog Devices AD7265 and AD7266
+	  ADCs.
+
 config AT91_ADC
 	tristate "Atmel AT91 ADC"
 	depends on ARCH_AT91

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
@@ -2,4 +2,5 @@
 # Makefile for IIO ADC drivers
 #
 
+obj-$(CONFIG_AD7266) += ad7266.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o