Merge commit 'v3.2-rc3' into next

1 files changed, 10 insertions, 16 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index a1aa35a053b7..22d875fde53a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -134,6 +134,16 @@ config INPUT_MAX8925_ONKEY
           To compile this driver as a module, choose M here: the module
           will be called max8925_onkey.
 
+config INPUT_MC13783_PWRBUTTON
+        tristate "MC13783 ON buttons"
+        depends on MFD_MC13783
+        help
+          Support the ON buttons of MC13783 PMIC as an input device
+          reporting power button status.
+
+          To compile this driver as a module, choose M here: the module
+          will be called mc13783-pwrbutton.
+
 config INPUT_MMA8450
         tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
         depends on I2C
@@ -217,22 +227,6 @@ config INPUT_ATLAS_BTNS
           To compile this driver as a module, choose M here: the module will
           be called atlas_btns.
 
-config INPUT_ATI_REMOTE
-        tristate "ATI / X10 USB RF remote control"
-        depends on USB_ARCH_HAS_HCD
-        select USB
-        help
-          Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
-          These are RF remotes with USB receivers.
-          The ATI remote comes with many of ATI's All-In-Wonder video cards.
-          The X10 "Lola" remote is available at:
-             <http://www.x10.com/products/lola_sg1.htm>
-          This driver provides mouse pointer, left and right mouse buttons,
-          and maps all the other remote buttons to keypress events.
-
-          To compile this driver as a module, choose M here: the module will be
-          called ati_remote.
-
 config INPUT_ATI_REMOTE2
         tristate "ATI / Philips USB RF remote control"
         depends on USB_ARCH_HAS_HCD