1 files changed, 33 insertions, 6 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7c0f1ecfdd7a..259ef31abb18 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -72,6 +72,16 @@ config INPUT_AD714X_SPI
           To compile this driver as a module, choose M here: the
           module will be called ad714x-spi.
 
+config INPUT_ARIZONA_HAPTICS
+        tristate "Arizona haptics support"
+        depends on MFD_ARIZONA && SND_SOC
+        select INPUT_FF_MEMLESS
+        help
+          Say Y to enable support for the haptics module in Arizona CODECs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called arizona-haptics.
+
 config INPUT_BMA150
         tristate "BMA150/SMB380 acceleration sensor support"
         depends on I2C
@@ -290,8 +300,7 @@ config INPUT_ATI_REMOTE2
           called ati_remote2.
 
 config INPUT_KEYSPAN_REMOTE
-        tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "Keyspan DMR USB remote control"
         depends on USB_ARCH_HAS_HCD
         select USB
         help
@@ -340,7 +349,6 @@ config INPUT_POWERMATE
 
 config INPUT_YEALINK
         tristate "Yealink usb-p1k voip phone"
-        depends on EXPERIMENTAL
         depends on USB_ARCH_HAS_HCD
         select USB
         help
@@ -356,7 +364,6 @@ config INPUT_YEALINK
 
 config INPUT_CM109
         tristate "C-Media CM109 USB I/O Controller"
-        depends on EXPERIMENTAL
         depends on USB_ARCH_HAS_HCD
         select USB
         help
@@ -367,6 +374,16 @@ config INPUT_CM109
           To compile this driver as a module, choose M here: the module will be
           called cm109.
 
+config INPUT_RETU_PWRBUTTON
+        tristate "Retu Power button Driver"
+        depends on MFD_RETU
+        help
+          Say Y here if you want to enable power key reporting via the
+          Retu chips found in Nokia Internet Tablets (770, N800, N810).
+
+          To compile this driver as a module, choose M here. The module will
+          be called retu-pwrbutton.
+
 config INPUT_TWL4030_PWRBUTTON
         tristate "TWL4030 Power button Driver"
         depends on TWL4030_CORE
@@ -434,7 +451,7 @@ config INPUT_PCF50633_PMU
 
 config INPUT_PCF8574
         tristate "PCF8574 Keypad input device"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         help
           Say Y here if you want to support a keypad connected via I2C
           with a PCF8574.
@@ -444,7 +461,7 @@ config INPUT_PCF8574
 
 config INPUT_PWM_BEEPER
         tristate "PWM beeper support"
-        depends on HAVE_PWM
+        depends on HAVE_PWM || PWM
         help
           Say Y here to get support for PWM based beeper devices.
 
@@ -486,6 +503,16 @@ config INPUT_DA9052_ONKEY
           To compile this driver as a module, choose M here: the
           module will be called da9052_onkey.
 
+config INPUT_DA9055_ONKEY
+        tristate "Dialog Semiconductor DA9055 ONKEY"
+        depends on MFD_DA9055
+        help
+          Support the ONKEY of DA9055 PMICs as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called da9055_onkey.
+
 config INPUT_DM355EVM
         tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
         depends on MFD_DM355EVM_MSP