Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', ...
Jiri Kosina [Thu, 17 Mar 2011 13:31:46 +0000 (14:31 +0100)]
1  2  3  4  5  6  7 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
drivers/hid/hidraw.c
include/linux/hid.h
net/bluetooth/hidp/core.c

Simple merge
@@@@@@@@ -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
@@@@@@@@ -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) },
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge