From: Jiri Kosina Date: Thu, 4 Jul 2013 13:02:26 +0000 (+0200) Subject: Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into... X-Git-Tag: firefly_0821_release~176^2~5777^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=08ec2dcc3527a20c619aca2fb36f800908256bac;p=firefly-linux-kernel-4.4.55.git Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus Conflicts: drivers/hid/hid-core.c --- 08ec2dcc3527a20c619aca2fb36f800908256bac diff --cc drivers/hid/Makefile index 7a0340ace186,2065694f57ab,833abcf19d68,b15602bfaccf..ffd0d9826d84 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@@@@ -52,8 -51,7 -51,7 -51,8 +52,9 @@@@@ obj-$(CONFIG_HID_ELO) += hid-elo. obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o +++obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o +++ obj-$(CONFIG_HID_HUION) += hid-huion.o obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o obj-$(CONFIG_HID_ICADE) += hid-icade.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o diff --cc drivers/hid/hid-core.c index b29c956c395c,264f55099940,ecd1107a5488,27aa7c76b93d..e39dac68063c --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@ -1586,8 -1584,6 -1584,6 -1584,7 +1586,9 @@@@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, +++ { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) }, +++ { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, +++ { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) }, { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },