[ 106/108] Input: xpad - add signature for Razer Onza Tournament Edition

2012-07-22 Thread Ben Hutchings 
3.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Ilia Katsnelson 

commit cc71a7e899cc6b2ff41e1be48756782ed004d802 upstream.

Signed-off-by: Ilia Katsnelson 
Signed-off-by: Dmitry Torokhov 
Signed-off-by: Ben Hutchings 
---
 drivers/input/joystick/xpad.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 0369364..e066528 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -164,6 +164,7 @@ static const struct xpad_device {
{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, 
XTYPE_XBOX360 },
+   { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x, 0x, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
{ 0x, 0x, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
 };
@@ -244,7 +245,8 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x1430),/* RedOctane X-Box 360 
controllers */
XPAD_XBOX360_VENDOR(0x146b),/* BigBen Interactive 
Controllers */
XPAD_XBOX360_VENDOR(0x1bad),/* Harminix Rock Band Guitar 
and Drums */
-   XPAD_XBOX360_VENDOR(0x0f0d),/* Hori Controllers */
+   XPAD_XBOX360_VENDOR(0x0f0d),/* Hori Controllers */
+   XPAD_XBOX360_VENDOR(0x1689),/* Razer Onza */
{ }
 };
 


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

[ 106/108] Input: xpad - add signature for Razer Onza Tournament Edition

2012-07-22 Thread Ben Hutchings 
3.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Ilia Katsnelson k0009...@gmail.com

commit cc71a7e899cc6b2ff41e1be48756782ed004d802 upstream.

Signed-off-by: Ilia Katsnelson k0009...@gmail.com
Signed-off-by: Dmitry Torokhov dmitry.torok...@gmail.com
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
 drivers/input/joystick/xpad.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 0369364..e066528 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -164,6 +164,7 @@ static const struct xpad_device {
{ 0x1bad, 0x0003, Harmonix Rock Band Drumkit, MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x0f0d, 0x0016, Hori Real Arcade Pro.EX, MAP_TRIGGERS_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x0f0d, 0x000d, Hori Fighting Stick EX2, MAP_TRIGGERS_TO_BUTTONS, 
XTYPE_XBOX360 },
+   { 0x1689, 0xfd00, Razer Onza Tournament Edition, MAP_DPAD_TO_BUTTONS, 
XTYPE_XBOX360 },
{ 0x, 0x, Chinese-made Xbox Controller, 0, XTYPE_XBOX },
{ 0x, 0x, Generic X-Box pad, 0, XTYPE_UNKNOWN }
 };
@@ -244,7 +245,8 @@ static struct usb_device_id xpad_table [] = {
XPAD_XBOX360_VENDOR(0x1430),/* RedOctane X-Box 360 
controllers */
XPAD_XBOX360_VENDOR(0x146b),/* BigBen Interactive 
Controllers */
XPAD_XBOX360_VENDOR(0x1bad),/* Harminix Rock Band Guitar 
and Drums */
-   XPAD_XBOX360_VENDOR(0x0f0d),/* Hori Controllers */
+   XPAD_XBOX360_VENDOR(0x0f0d),/* Hori Controllers */
+   XPAD_XBOX360_VENDOR(0x1689),/* Razer Onza */
{ }
 };
 


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