diff options
| author | Tommi Rantala <tt.rantala@gmail.com> | 2014-10-16 14:02:07 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-05-26 16:26:58 +0200 |
| commit | 5c2747507dcd611da078fdf66be467bdef3975a2 (patch) | |
| tree | 6ae14793575952c5294900ff76d013782a23d555 /drivers/input | |
| parent | 9a30c06838feb1263b5cae05e7f871d99e7da94f (diff) | |
Input: xpad - add Thrustmaster as Xbox 360 controller vendor
commit 4dfb15cd5aaa6682e93854a74b394a1c95b82621 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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 86a98b76e578..b0575bc518c1 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -294,6 +294,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 */ |