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

[cascardo/linux.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c1a81bc..b0c6772 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -430,4 +430,28 @@ config INPUT_ADXL34X_SPI
          To compile this driver as a module, choose M here: the
          module will be called adxl34x-spi.
 
+config INPUT_CMA3000
+       tristate "VTI CMA3000 Tri-axis accelerometer"
+       help
+         Say Y here if you want to use VTI CMA3000_D0x Accelerometer
+         driver
+
+         This driver currently only supports I2C interface to the
+         controller. Also select the I2C method.
+
+         If unsure, say N
+
+         To compile this driver as a module, choose M here: the
+         module will be called cma3000_d0x.
+
+config INPUT_CMA3000_I2C
+       tristate "Support I2C bus connection"
+       depends on INPUT_CMA3000 && I2C
+       help
+         Say Y here if you want to use VTI CMA3000_D0x Accelerometer
+         through I2C interface.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cma3000_d0x_i2c.
+
 endif