---

yaml --- r: 220315 b: refs/heads/master c: 2a28f6c h: refs/heads/master i: 220313: e1cb946 220311: 47ee192 v: v3
git-mirror · Oct 14, 2010 · c27bb35 · c27bb35
1 parent 681893c
commit c27bb35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af73713642c1c02e5afefb0f807f406e835c0b7f
+refs/heads/master: 2a28f6cb74c23ee3ccc0dce249d5fba509fd94ca
diff --git a/trunk/drivers/staging/iio/adc/Kconfig b/trunk/drivers/staging/iio/adc/Kconfig
@@ -50,6 +50,9 @@ config AD799X_RING_BUFFER
 config AD7476
 	tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
 	depends on SPI
+	select IIO_RING_BUFFER	
+	select IIO_SW_RING
+	select IIO_TRIGGER 	
 	help
 	  Say yes here to build support for Analog Devices
 	  AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495

diff --git a/trunk/drivers/staging/iio/adc/ad7476.h b/trunk/drivers/staging/iio/adc/ad7476.h
@@ -59,9 +59,7 @@ int ad7476_scan_from_ring(struct ad7476_state *st);
 int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7476_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_IIO_RING_BUFFER */
-static inline ssize_t ad7476_scan_from_ring(struct device *dev,
-					     struct device_attribute *attr,
-					     char *buf)
+static inline int ad7476_scan_from_ring(struct ad7476_state *st)
 {
 	return 0;
 }