From: Jiri Kosina Date: Thu, 17 Mar 2011 13:31:46 +0000 (+0100) Subject: Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', ... X-Git-Tag: firefly_0821_release~7613^2~2157^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4;p=firefly-linux-kernel-4.4.55.git Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', 'upstream' and 'upstream-fixes' into for-linus --- 65b06194c9c9f41bc07ac6a6d42edb4b9e43fea4 diff --cc drivers/hid/Makefile index bb744e6f75e6,6efc2a0370ad,29e98985b901,6efc2a0370ad,cb80181da905,125ba103eba0,6efc2a0370ad..06c68ae3abee --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@@@@@@@ -34,9 -34,9 -34,8 -34,9 -34,9 -34,9 -34,9 +34,8 @@@@@@@@ obj-$(CONFIG_HID_CANDO) += hid-cando. obj-$(CONFIG_HID_CHERRY) += hid-cherry.o obj-$(CONFIG_HID_CHICONY) += hid-chicony.o obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o ------obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o ++++++obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o -- ----obj-$(CONFIG_HID_EGALAX) += hid-egalax.o obj-$(CONFIG_HID_ELECOM) += hid-elecom.o obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o diff --cc drivers/hid/hid-core.c index 75af1f835320,d678cf3d33d5,a5f6439fa78e,d678cf3d33d5,0180f20d4fa7,c650efb52a45,f99413b6cb88..c3d66269ed7d --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@@@@ -1346,9 -1345,9 -1345,10 -1345,9 -1345,9 -1376,11 -1345,9 +1377,12 @@@@@@@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) }, ++ ++++ { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, +++++ + { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, +++++ + { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },