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

[pandora-kernel.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 45dc6aa..a1aa35a 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -62,6 +62,17 @@ config INPUT_AD714X_SPI
          To compile this driver as a module, choose M here: the
          module will be called ad714x-spi.
 
+config INPUT_BMA150
+       tristate "BMA150/SMB380 acceleration sensor support"
+       depends on I2C
+       select INPUT_POLLDEV
+       help
+         Say Y here if you have Bosch Sensortec's BMA150 or SMB380
+         acceleration sensor hooked to an I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bma150.
+
 config INPUT_PCSPKR
        tristate "PC Speaker support"
        depends on PCSPKR_PLATFORM
@@ -74,6 +85,29 @@ config INPUT_PCSPKR
          To compile this driver as a module, choose M here: the
          module will be called pcspkr.
 
+config INPUT_PM8XXX_VIBRATOR
+       tristate "Qualcomm PM8XXX vibrator support"
+       depends on MFD_PM8XXX
+       select INPUT_FF_MEMLESS
+       help
+         This option enables device driver support for the vibrator
+         on Qualcomm PM8xxx chip. This driver supports ff-memless interface
+         from input framework.
+
+         To compile this driver as module, choose M here: the
+         module will be called pm8xxx-vibrator.
+
+config INPUT_PMIC8XXX_PWRKEY
+       tristate "PMIC8XXX power key support"
+       depends on MFD_PM8XXX
+       help
+         Say Y here if you want support for the PMIC8XXX power key.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pmic8xxx-pwrkey.
+
 config INPUT_SPARCSPKR
        tristate "SPARC Speaker support"
        depends on PCI && SPARC64
@@ -100,6 +134,27 @@ config INPUT_MAX8925_ONKEY
          To compile this driver as a module, choose M here: the module
          will be called max8925_onkey.
 
+config INPUT_MMA8450
+       tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
+       depends on I2C
+       select INPUT_POLLDEV
+       help
+         Say Y here if you want to support Freescale's MMA8450 Accelerometer
+         through I2C interface.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mma8450.
+
+config INPUT_MPU3050
+       tristate "MPU3050 Triaxial gyroscope sensor"
+       depends on I2C
+       help
+         Say Y here if you want to support InvenSense MPU3050
+         connected via an I2C bus.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mpu3050.
+
 config INPUT_APANEL
        tristate "Fujitsu Lifebook Application Panel buttons"
        depends on X86 && I2C && LEDS_CLASS
@@ -209,6 +264,23 @@ config INPUT_KEYSPAN_REMOTE
          To compile this driver as a module, choose M here: the module will
          be called keyspan_remote.
 
+config INPUT_KXTJ9
+       tristate "Kionix KXTJ9 tri-axis digital accelerometer"
+       depends on I2C
+       help
+         Say Y here to enable support for the Kionix KXTJ9 digital tri-axis
+         accelerometer.
+
+         To compile this driver as a module, choose M here: the module will
+         be called kxtj9.
+
+config INPUT_KXTJ9_POLLED_MODE
+       bool "Enable polling mode support"
+       depends on INPUT_KXTJ9
+       select INPUT_POLLDEV
+       help
+         Say Y here if you need accelerometer to work in polling mode.
+
 config INPUT_POWERMATE
        tristate "Griffin PowerMate and Contour Jog support"
        depends on USB_ARCH_HAS_HCD
@@ -267,7 +339,7 @@ config INPUT_TWL4030_PWRBUTTON
 config INPUT_TWL4030_VIBRA
        tristate "Support for TWL4030 Vibrator"
        depends on TWL4030_CORE
-       select TWL4030_CODEC
+       select MFD_TWL4030_AUDIO
        select INPUT_FF_MEMLESS
        help
          This option enables support for TWL4030 Vibrator Driver.
@@ -275,6 +347,17 @@ config INPUT_TWL4030_VIBRA
          To compile this driver as a module, choose M here. The module will
          be called twl4030_vibra.
 
+config INPUT_TWL6040_VIBRA
+       tristate "Support for TWL6040 Vibrator"
+       depends on TWL4030_CORE
+       select TWL6040_CORE
+       select INPUT_FF_MEMLESS
+       help
+         This option enables support for TWL6040 Vibrator Driver.
+
+         To compile this driver as a module, choose M here. The module will
+         be called twl6040_vibra.
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help
@@ -330,17 +413,6 @@ config INPUT_PWM_BEEPER
          To compile this driver as a module, choose M here: the module will be
          called pwm-beeper.
 
-config INPUT_PMIC8XXX_PWRKEY
-       tristate "PMIC8XXX power key support"
-       depends on MFD_PM8XXX
-       help
-         Say Y here if you want support for the PMIC8XXX power key.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pmic8xxx-pwrkey.
-
 config INPUT_GPIO_ROTARY_ENCODER
        tristate "Rotary encoders connected to GPIO pins"
        depends on GPIOLIB && GENERIC_GPIO