From: Jiri Kosina Date: Fri, 22 Jul 2011 20:47:08 +0000 (+0200) Subject: Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a91f423e598912ab301592c7759cfd89e10682a1;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus --- a91f423e598912ab301592c7759cfd89e10682a1 diff --cc drivers/hid/hid-core.c index c957c4b4fe70,9657007e4927,eccaf8ad26c1..1a5cf0c9cfca --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@ -1422,8 -1423,9 -1423,9 +1424,10 @@@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) }, { HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH_DUAL) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) }, + + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },