From f735fab0cdbd5f5f87f9336c1c3f9f0be3977ae8 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 27 Aug 2008 11:21:42 +0200
Subject: [PATCH] --- yaml --- r: 114451 b: refs/heads/master c:
 66ebf66e497094f2c3fb3107d309c6a753beb0ff h: refs/heads/master i:   114449:
 831dcef551bb663bb2575f45467d96cd16a14e16   114447:
 a38b5e990f4f3a3d6f1cb28815d957118a35bf88 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/hid/hid-ids.h           | 3 ++-
 trunk/drivers/hid/usbhid/hid-quirks.c | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08986ecc2b66..5adfcce57aa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0bd6a429819f794f626f9e73be4564e18e132db
+refs/heads/master: 66ebf66e497094f2c3fb3107d309c6a753beb0ff
diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h
index e2fd52ca68b7..0784a09f5adb 100644
--- a/trunk/drivers/hid/hid-ids.h
+++ b/trunk/drivers/hid/hid-ids.h
@@ -373,7 +373,8 @@
 #define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800
 #define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866
 
-#define USB_VENDOR_ID_WISEGROUP_LTD	0x6677
+#define USB_VENDOR_ID_WISEGROUP_LTD	0x6666
+#define USB_VENDOR_ID_WISEGROUP_LTD2	0x6677
 #define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802
 
 #define USB_VENDOR_ID_YEALINK		0x6993
diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c
index 71bf64bc1466..d40f00904c5e 100644
--- a/trunk/drivers/hid/usbhid/hid-quirks.c
+++ b/trunk/drivers/hid/usbhid/hid-quirks.c
@@ -59,6 +59,7 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
 	{ USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+	{ USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
 	{ 0, 0 }
 };