Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / iio / accel / Kconfig

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index e4a758cd7d3544eebfcca6cfbcb9481736e920a6..89d78208de3f30d6396162a208eb0f29460087b7 100644 (file)
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -17,6 +17,16 @@ config BMA180
          To compile this driver as a module, choose M here: the
          module will be called bma180.
 
+config BMA220
+    tristate "Bosch BMA220 3-Axis Accelerometer Driver"
+       depends on SPI
+    help
+      Say yes here to add support for the Bosch BMA220 triaxial
+      acceleration sensor.
+
+      To compile this driver as a module, choose M here: the
+      module will be called bma220_spi.
+
 config BMC150_ACCEL
        tristate "Bosch BMC150 Accelerometer Driver"
        select IIO_BUFFER
@@ -136,13 +146,23 @@ config MMA7455_SPI
          To compile this driver as a module, choose M here: the module
          will be called mma7455_spi.
 
+config MMA7660
+       tristate "Freescale MMA7660FC 3-Axis Accelerometer Driver"
+       depends on I2C
+       help
+         Say yes here to get support for the Freescale MMA7660FC 3-Axis
+         accelerometer.
+
+         Choosing M will build the driver as a module. If so, the module
+         will be called mma7660.
+
 config MMA8452
-       tristate "Freescale MMA8452Q and similar Accelerometers Driver"
+       tristate "Freescale / NXP MMA8452Q and similar Accelerometers Driver"
        depends on I2C
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
-         Say yes here to build support for the following Freescale 3-axis
+         Say yes here to build support for the following Freescale / NXP 3-axis
          accelerometers: MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC,
          FXLS8471Q.