From 4a56a176e0aef18de505c041973ce1c91e80e415 Mon Sep 17 00:00:00 2001 From: Peter Edwards Date: Sun, 11 Jul 2010 17:45:50 +0100 Subject: [PATCH] --- yaml --- r: 200957 b: refs/heads/master c: 1f45e3249cd4720ab72c3bea82c27162a2d8b577 h: refs/heads/master i: 200955: 12b29e3bc797a34acc59464ddba6148488c70c9e v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-ids.h | 2 ++ trunk/drivers/hid/usbhid/hid-quirks.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e59b16d3f22f..8ec3fe1a64bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8e846461184c130fa4db90f1d218e1dffb97612 +refs/heads/master: 1f45e3249cd4720ab72c3bea82c27162a2d8b577 diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index be8bb100c9ea..31601eef25dd 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -370,6 +370,8 @@ #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 +#define USB_VENDOR_ID_MOJO 0x8282 +#define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 #define USB_VENDOR_ID_MONTEREY 0x0566 #define USB_DEVICE_ID_GENIUS_KB29E 0x3004 diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c index 82ec64a840b6..5f5aa39b3988 100644 --- a/trunk/drivers/hid/usbhid/hid-quirks.c +++ b/trunk/drivers/hid/usbhid/hid-quirks.c @@ -34,6 +34,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },