1 files changed, 58 insertions, 18 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b49e23379723..45dc6aa62ba4 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -22,6 +22,16 @@ config INPUT_88PM860X_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called 88pm860x_onkey.
 
+config INPUT_AB8500_PONKEY
+        tristate "AB8500 Pon (PowerOn) Key"
+        depends on AB8500_CORE
+        help
+          Say Y here to use the PowerOn Key for ST-Ericsson's AB8500
+          Mix-Sig PMIC.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ab8500-ponkey.
+
 config INPUT_AD714X
         tristate "Analog Devices AD714x Capacitance Touch Sensor"
         help
@@ -284,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
@@ -338,6 +330,17 @@ 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
@@ -438,4 +441,41 @@ 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.
+
+config INPUT_XEN_KBDDEV_FRONTEND
+        tristate "Xen virtual keyboard and mouse support"
+        depends on XEN_FBDEV_FRONTEND
+        default y
+        select XEN_XENBUS_FRONTEND
+        help
+          This driver implements the front-end of the Xen virtual
+          keyboard and mouse device driver.  It communicates with a back-end
+          in another domain.
+
+          To compile this driver as a module, choose M here: the
+          module will be called xen-kbdfront.
+
 endif