summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorTommi Rantala <tt.rantala@gmail.com>2014-10-16 14:02:07 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-16 14:05:40 -0700
commit4dfb15cd5aaa6682e93854a74b394a1c95b82621 (patch)
tree3b249f3905b0593494dac5ee1c7d549178d17b07 /drivers/input/joystick
parent4b54625822eb7a4eae9c5b8c890b6c4dc001b895 (diff)
downloadblackbird-op-linux-4dfb15cd5aaa6682e93854a74b394a1c95b82621.tar.gz
blackbird-op-linux-4dfb15cd5aaa6682e93854a74b394a1c95b82621.zip
Input: xpad - add Thrustmaster as Xbox 360 controller vendor
Add Thrustmaster as Xbox 360 controller vendor. This is required for example to make the GP XID (044f:b326) gamepad work. Signed-off-by: Tommi Rantala <tt.rantala@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
-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 cee4fe302f5a..2ed7905a068f 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -293,6 +293,7 @@ static const signed short xpad_abs_triggers[] = {
static struct usb_device_id xpad_table[] = {
{ USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */
+ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */
OpenPOWER on IntegriCloud