Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / drivers / iio / Kconfig

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 9af763a90d9330a42b7bebd7007b9d5fbe65b0d2..cbea3271c1b1a43e564392b0107ac40a6356bc02 100644 (file)
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -23,15 +23,14 @@ if IIO_BUFFER
 config IIO_BUFFER_CB
 boolean "IIO callback buffer used for push in-kernel interfaces"
        help
-         Should be selected by any drivers that do-inkernel push
+         Should be selected by any drivers that do in-kernel push
          usage.  That is, those where the data is pushed to the consumer.
 
 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
@@ -74,5 +73,6 @@ if IIO_TRIGGER
    source "drivers/iio/trigger/Kconfig"
 endif #IIO_TRIGGER
 source "drivers/iio/pressure/Kconfig"
+source "drivers/iio/temperature/Kconfig"
 
 endif # IIO