From ba32fdbeb271ae71885cc727fb1530dca444cfde Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 28 Nov 2007 16:34:53 +0100 Subject: [PATCH] --- yaml --- r: 77655 b: refs/heads/master c: 0887b4cb2102e281c123abf1408f218c15fd3ba3 h: refs/heads/master i: 77653: 15c7c2c964c714de3951ba41db675e27f8bc5ab7 77651: 910d3e9828e6214b9c1ec5801d2430069d3a3148 77647: 1e647efa6a3d8eec286e094510e34b5fc15a5fdf v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-quirks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d60bd02a7e62..a4fc08630489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f6b37275a9f5fbb0b6657a226a633533a1b2e09 +refs/heads/master: 0887b4cb2102e281c123abf1408f218c15fd3ba3 diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c index 23c8993a9845..c810d455d086 100644 --- a/trunk/drivers/hid/usbhid/hid-quirks.c +++ b/trunk/drivers/hid/usbhid/hid-quirks.c @@ -544,7 +544,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT }, - { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, + { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER | HID_QUIRK_HIDDEV }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },