diff options
| author | Yuri Khan <yurivkhan@gmail.com> | 2012-07-11 00:49:18 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-25 04:11:47 +0100 |
| commit | 6cfcea9befbd9740e856674e43fdbdf01c0b36bc (patch) | |
| tree | e3534ff53f165437e8173191cb45daabc7ff441d /drivers/input | |
| parent | f7ca712ade543ecad0e37b0758f77eb0a84c2a40 (diff) | |
| download | kernel_samsung_smdk4412-6cfcea9befbd9740e856674e43fdbdf01c0b36bc.zip kernel_samsung_smdk4412-6cfcea9befbd9740e856674e43fdbdf01c0b36bc.tar.gz kernel_samsung_smdk4412-6cfcea9befbd9740e856674e43fdbdf01c0b36bc.tar.bz2 | |
Input: xpad - handle all variations of Mad Catz Beat Pad
commit 3ffb62cb9ac2430c2504c6ff9727d0f2476ef0bd upstream.
The device should be handled by xpad driver instead of generic HID driver.
Signed-off-by: Yuri Khan <yurivkhan@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index d728875..a2daf38 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ |