Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b99b8cbde02f531ba08fbcfa2f8b10f4d52e0c02..b0c6772851a99496727663941e092b46f81482e3 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -294,24 +294,6 @@ config INPUT_SGI_BTNS
          To compile this driver as a module, choose M here: the
          module will be called sgi_btns.
 
-config INPUT_WINBOND_CIR
-       tristate "Winbond IR remote control"
-       depends on X86 && PNP
-       select NEW_LEDS
-       select LEDS_CLASS
-       select LEDS_TRIGGERS
-       select BITREVERSE
-       help
-         Say Y here if you want to use the IR remote functionality found
-         in some Winbond SuperI/O chips. Currently only the WPCD376I
-         chip is supported (included in some Intel Media series motherboards).
-
-         IR Receive and wake-on-IR from suspend and power-off is currently
-         supported.
-
-         To compile this driver as a module, choose M here: the module will be
-         called winbond_cir.
-
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"
        depends on (GSC || HP300) && SERIO
@@ -448,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