Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / iio / Kconfig

diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index 2461d0173cec0f66f84903a6e2642f1e777d101e..ed48815a916b37b1d5c5ffd2aca810b863276baf 100755 (executable)
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -8,7 +8,7 @@ menuconfig IIO
        ---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
+         number of different physical interfaces (i2c, spi, etc). See
          Documentation/industrialio for more information.
 if IIO
 
@@ -21,12 +21,13 @@ config IIO_RING_BUFFER
 if IIO_RING_BUFFER
 
 config IIO_SW_RING
+       select IIO_TRIGGER
        tristate "Industrial I/O lock free software ring"
        help
-       example software ring buffer implementation.  The design aim
-       of this particular realization was to minize write locking
-       with the intention that some devices would be able to write
-       in interrupt context.
+         Example software ring buffer implementation.  The design aim
+         of this particular realization was to minimize write locking
+         with the intention that some devices would be able to write
+         in interrupt context.
 
 endif # IIO_RINGBUFFER
 
@@ -41,7 +42,11 @@ config IIO_TRIGGER
 
 source "drivers/staging/iio/accel/Kconfig"
 source "drivers/staging/iio/adc/Kconfig"
+source "drivers/staging/iio/gyro/Kconfig"
+source "drivers/staging/iio/imu/Kconfig"
 source "drivers/staging/iio/light/Kconfig"
+source "drivers/staging/iio/magnetometer/Kconfig"
+
 source "drivers/staging/iio/trigger/Kconfig"
 
 endif # IIO