From: Jiri Kosina Date: Thu, 21 Feb 2013 09:45:52 +0000 (+0100) Subject: Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus X-Git-Tag: v3.9-rc1~112^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d69a3c731e120b05b7da9fb976830475a3fbc01;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus Conflicts: drivers/hid/hid-core.c --- 0d69a3c731e120b05b7da9fb976830475a3fbc01 diff --cc drivers/hid/Makefile index 9301704,b622157,247f2b8..72d1b0b --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@@@ -101,9 -101,8 -101,9 +101,10 @@@@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsun obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o obj-$(CONFIG_HID_SONY) += hid-sony.o obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o ++ obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o ++obj-$(CONFIG_HID_THINGM) += hid-thingm.o obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o obj-$(CONFIG_HID_TIVO) += hid-tivo.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o diff --cc drivers/hid/hid-core.c index 6e90415,1651728,65cda7f..ff75cab --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@ -1702,8 -1697,8 -1697,8 +1702,9 @@@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) }, { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },