From 452dbfad64c181bae8cd9239e5ebba8a7eb4d84c Mon Sep 17 00:00:00 2001 From: Shawn Joseph Date: Tue, 18 Jun 2013 23:07:45 -0700 Subject: [PATCH] --- yaml --- r: 377323 b: refs/heads/master c: be66227151c0cd4da536098c3ee07809101c6faa h: refs/heads/master i: 377321: 5390bdb642cd0a3b2ffa6110806af6eb6e2024bc 377319: 715b4dcfe4890b62810c0978df42b7db09af65dc v: v3 --- [refs] | 2 +- trunk/drivers/input/joystick/xpad.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 923bf94863a3..2fe11307e9ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d753b0d387073be243f7ff52cc84dfa1391c1e7 +refs/heads/master: be66227151c0cd4da536098c3ee07809101c6faa diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c index d6cbfe9df218..fa061d46527f 100644 --- a/trunk/drivers/input/joystick/xpad.c +++ b/trunk/drivers/input/joystick/xpad.c @@ -137,7 +137,7 @@ static const struct xpad_device { { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", 0, XTYPE_XBOX }, { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", 0, XTYPE_XBOX360 }, - { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", XTYPE_XBOX360 }, + { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },