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

[pandora-kernel.git] / drivers / staging / iio / Kconfig

diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index 6775bf9..d329635 100644 (file)
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -4,18 +4,18 @@
 
 menuconfig IIO
        tristate "Industrial I/O support"
-       depends on !S390
-       ---help---
+       depends on GENERIC_HARDIRQS
+       help
          The industrial I/O subsystem provides a unified framework for
          drivers for many different types of embedded sensors using a
          number of different physical interfaces (i2c, spi, etc). See
-         Documentation/industrialio for more information.
+         drivers/staging/iio/Documentation for more information.
 if IIO
 
 config IIO_RING_BUFFER
-       bool "Enable ring buffer support within IIO"
+       bool "Enable buffer support within IIO"
        help
-         Provide core support for various ring buffer based data
+         Provide core support for various buffer based data
          acquisition methods.
 
 if IIO_RING_BUFFER
@@ -48,6 +48,13 @@ config IIO_TRIGGER
          ring buffers.  The triggers are effectively a 'capture
          data now' interrupt.
 
+config IIO_CONSUMERS_PER_TRIGGER
+       int "Maximum number of consumers per trigger"
+       depends on IIO_TRIGGER
+       default "2"
+       help
+       This value controls the maximum number of consumers that a
+       given trigger may handle. Default is 2.
 
 source "drivers/staging/iio/accel/Kconfig"
 source "drivers/staging/iio/adc/Kconfig"