aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYuri Khan <yurivkhan@gmail.com>2012-07-11 22:12:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-19 08:58:21 -0700
commit9c5d9de68ea54ae743b1cb36645c96b8fdcc1c8d (patch)
tree20396cdcf5db9a533e1c0ec82a700fd3f2dffdcf /drivers
parentc90dab38fe75c7a131a3db8d35aedaf155aede04 (diff)
downloadkernel_samsung_smdk4412-9c5d9de68ea54ae743b1cb36645c96b8fdcc1c8d.tar.gz
kernel_samsung_smdk4412-9c5d9de68ea54ae743b1cb36645c96b8fdcc1c8d.tar.bz2
kernel_samsung_smdk4412-9c5d9de68ea54ae743b1cb36645c96b8fdcc1c8d.zip
Input: xpad - add Andamiro Pump It Up pad
commit e76b8ee25e034ab601b525abb95cea14aa167ed3 upstream. I couldn't find the vendor ID in any of the online databases, but this mat has a Pump It Up logo on the top side of the controller compartment, and a disclaimer stating that Andamiro will not be liable on the bottom. Signed-off-by: Yuri Khan <yurivkhan@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/joystick/xpad.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 56abf3d0e91..92c7be14bd4 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -142,6 +142,7 @@ static const struct xpad_device {
{ 0x0c12, 0x880a, "Pelican Eclipse PL-2023", 0, XTYPE_XBOX },
{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
+ { 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
{ 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 0, XTYPE_XBOX },