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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits)
  Input: i8042 - add Dell Vostro 1510 to nomux list
  Input: gtco - use USB endpoint API
  Input: add support for Maple controller as a joystick
  Input: atkbd - broaden the Dell DMI signatures
  Input: HIL drivers - add MODULE_ALIAS()
  Input: map_to_7segment.h - convert to __inline__ for userspace
  Input: add support for enhanced rotary controller on pxa930 and pxa935
  Input: add support for trackball on pxa930 and pxa935
  Input: add da9034 touchscreen support
  Input: ads7846 - strict_strtoul takes unsigned long
  Input: make some variables and functions static
  Input: add tsc2007 based touchscreen driver
  Input: psmouse - add module parameters to control OLPC touchpad delays
  Input: i8042 - add Gigabyte M912 netbook to noloop exception table
  Input: atkbd - Samsung NC10 key repeat fix
  Input: atkbd - add keyboard quirk for HP Pavilion ZV6100 laptop
  Input: libps2 - handle 0xfc responses from devices
  Input: add support for Wacom W8001 penabled serial touchscreen
  Input: synaptics - report multi-taps only if supported by the device
  Input: add joystick driver for Walkera WK-0701 RC transmitter
  ...

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index be5c14a5a0a4..b11419590cfe 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -294,4 +294,28 @@ config JOYSTICK_XPAD_LEDS
           This option enables support for the LED which surrounds the Big X on
           XBox 360 controller.
 
+config JOYSTICK_WALKERA0701
+        tristate "Walkera WK-0701 RC transmitter"
+        depends on HIGH_RES_TIMERS && PARPORT
+        help
+          Say Y or M here if you have a Walkera WK-0701 transmitter which is
+          supplied with a ready to fly Walkera helicopters such as HM36,
+          HM37, HM60 and want to use it via parport as a joystick. More
+          information is available: <file:Documentation/input/walkera0701.txt>
+
+          To compile this driver as a module, choose M here: the
+          module will be called walkera0701.
+
+config JOYSTICK_MAPLE
+        tristate "Dreamcast control pad"
+        depends on MAPLE
+        help
+          Say Y here if you have a SEGA Dreamcast and want to use your
+          controller as a joystick.
+
+          Most Dreamcast users will say Y.
+
+          To compile this as a module choose M here: the module will be called
+          maplecontrol.
+
 endif