summaryrefslogtreecommitdiffstats
path: root/drivers/iio/Kconfig
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2013-06-23 22:28:00 +0100
committerJonathan Cameron <jic23@kernel.org>2013-08-03 18:40:30 +0100
commit1b2bbe3e662950fb60ce2683d5511ec4e369424f (patch)
tree549c4a095a6256e847c27a67b480d7222ef075f3 /drivers/iio/Kconfig
parent93232cd56433c7495084b103b989c6ae7bdb203e (diff)
downloadlinux-1b2bbe3e662950fb60ce2683d5511ec4e369424f.tar.gz
linux-1b2bbe3e662950fb60ce2683d5511ec4e369424f.tar.bz2
linux-1b2bbe3e662950fb60ce2683d5511ec4e369424f.zip
iio: remove mention of ring buffer from CONFIG_IIO_KFIFO_BUF, CONFIG_IIO_TRIGGER description
ring buffers are only in staging, don't mention them here Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/Kconfig')
-rw-r--r--drivers/iio/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index be8e303789af..524380c9ae6c 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -30,8 +30,7 @@ config IIO_KFIFO_BUF
select IIO_TRIGGER
tristate "Industrial I/O buffering based on kfifo"
help
- A simple fifo based on kfifo. Use this if you want a fifo
- rather than a ring buffer. Note that this currently provides
+ A simple fifo based on kfifo. Note that this currently provides
no buffer events so it is up to userspace to work out how
often to read from the buffer.
@@ -49,7 +48,7 @@ config IIO_TRIGGER
help
Provides IIO core support for triggers. Currently these
are used to initialize capture of samples to push into
- ring buffers. The triggers are effectively a 'capture
+ buffers. The triggers are effectively a 'capture
data now' interrupt.
config IIO_CONSUMERS_PER_TRIGGER