From: Jiri Kosina Date: Wed, 12 Dec 2012 15:52:27 +0000 (+0100) Subject: Merge branch 'for-3.8/sensors' into for-next X-Git-Tag: next-20130218~83^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34fa6e6fb34e9ecb54c51862b44eda3d79bc7648;p=karo-tx-linux.git Merge branch 'for-3.8/sensors' into for-next Conflicts: drivers/hid/hid-core.c --- 34fa6e6fb34e9ecb54c51862b44eda3d79bc7648 diff --cc drivers/hid/hid-core.c index a7688390ac62,c96e548cd7b8..b36c7a7b5c77 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@ -1589,11 -1580,6 +1598,7 @@@ 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_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_1020) }, - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_09FA) }, - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_1020) }, - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_09FA) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, { 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) },