From 16e7096a8eebe67342ed0b3cac8f62ff5cdf209d Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 10 Nov 2009 09:04:28 -0800
Subject: [PATCH] --- yaml --- r: 175227 b: refs/heads/master c:
 d5f5d89f0a48930436dba9735fda4663e7b55ed2 h: refs/heads/master i:   175225:
 afeef856fa55d0a4b0ee706de95ef213569bd322   175223:
 48543be7393839a18fbfd8afdf4c5c90f75064d5 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/iio/adc/Kconfig   | 9 +++++++++
 trunk/drivers/staging/iio/adc/Makefile  | 2 +-
 trunk/drivers/staging/iio/adc/max1363.h | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d44b2c42a0ce..83005d252792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e407980728123223fac5c2e8273bc6e7e43cfd
+refs/heads/master: d5f5d89f0a48930436dba9735fda4663e7b55ed2
diff --git a/trunk/drivers/staging/iio/adc/Kconfig b/trunk/drivers/staging/iio/adc/Kconfig
index a2f1626eab41..3989c0ca0e0d 100644
--- a/trunk/drivers/staging/iio/adc/Kconfig
+++ b/trunk/drivers/staging/iio/adc/Kconfig
@@ -12,3 +12,12 @@ config MAX1363
 	  convertors (ADC). (max1361, max1362, max1363, max1364, max1136,
 	  max1136, max1137, max1138, max1139, max1236, max1237, max11238,
 	  max1239) Provides direct access via sysfs.
+
+config MAX1363_RING_BUFFER
+	bool "MAXIM max1363: use ring buffer"
+	depends on MAX1363
+	select IIO_RING_BUFFER
+	select IIO_SW_RING
+	help
+	  Say yes here to include ring buffer support in the MAX1363
+	  ADC driver.
diff --git a/trunk/drivers/staging/iio/adc/Makefile b/trunk/drivers/staging/iio/adc/Makefile
index 0c2b6f39e8c8..08cee5c22b92 100644
--- a/trunk/drivers/staging/iio/adc/Makefile
+++ b/trunk/drivers/staging/iio/adc/Makefile
@@ -3,6 +3,6 @@
 #
 
 max1363-y := max1363_core.o
-max1363-$(CONFIG_IIO_RING_BUFFER) += max1363_ring.o
+max1363-$(CONFIG_MAX1363_RING_BUFFER) += max1363_ring.o
 
 obj-$(CONFIG_MAX1363) += max1363.o
diff --git a/trunk/drivers/staging/iio/adc/max1363.h b/trunk/drivers/staging/iio/adc/max1363.h
index 8aca81f14d0b..c112fbef2705 100644
--- a/trunk/drivers/staging/iio/adc/max1363.h
+++ b/trunk/drivers/staging/iio/adc/max1363.h
@@ -228,7 +228,7 @@ struct max1363_state {
 	struct iio_trigger		*trig;
 	struct regulator		*reg;
 };
-#ifdef CONFIG_IIO_RING_BUFFER
+#ifdef CONFIG_MAX1363_RING_BUFFER
 
 ssize_t max1363_scan_from_ring(struct device *dev,
 			       struct device_attribute *attr,
@@ -239,7 +239,7 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev);
 int max1363_initialize_ring(struct iio_ring_buffer *ring);
 void max1363_uninitialize_ring(struct iio_ring_buffer *ring);
 
-#else /* CONFIG_IIO_RING_BUFFER */
+#else /* CONFIG_MAX1363_RING_BUFFER */
 
 static inline void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
 {
@@ -265,5 +265,5 @@ max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 };
 
 static inline void max1363_ring_cleanup(struct iio_dev *indio_dev) {};
-#endif /* CONFIG_IIO_RING_BUFFER */
+#endif /* CONFIG_MAX1363_RING_BUFFER */
 #endif /* _MAX1363_H_ */