From: Tommi Rantala <[email protected]>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

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 <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
---
 drivers/input/joystick/xpad.c | 1 +
 1 file changed, 1 insertion(+)

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 */
-- 
2.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to