Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid...
authorJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:48:15 +0000 (10:48 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 28 Jul 2016 08:48:15 +0000 (10:48 +0200)
1  2  3  4  5 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

diff --combined drivers/hid/hid-core.c
index 7f989f696b17b88b9dea12207283b702cae6a5ad,21eadd9abca334431fecac6fbf40fe51b349d015,8ea3a26360e941614efd496a2d8435322e0ff567,8ea3a26360e941614efd496a2d8435322e0ff567,8ea3a26360e941614efd496a2d8435322e0ff567..873a8aff6462c96a2895feae9fbddbf6d332b279
@@@@@@ -1772,7 -1772,6 -1772,6 -1772,6 -1772,6 +1772,7 @@@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) },
 ++++   { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+ +++   { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },
diff --combined drivers/hid/hid-ids.h
index c4f665d4c80cca514df3de03d8cd924dd653d46a,b5e5415fdf7902fdea974180607d80fd05bfc057,3eec09a134cb66ac1b9e03f89e3c201cd1b48adb,3eec09a134cb66ac1b9e03f89e3c201cd1b48adb,3eec09a134cb66ac1b9e03f89e3c201cd1b48adb..59ff1fe998044e50574beae7b536ef0d6e4c73f6
     #define USB_VENDOR_ID_ALPS         0x0433
     #define USB_DEVICE_ID_IBM_GAMEPAD  0x1101
     
 ++++#define USB_VENDOR_ID_ALPS_JP              0x044E
 ++++#define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
 ++++
     #define USB_VENDOR_ID_ANTON                0x1130
     #define USB_DEVICE_ID_ANTON_TOUCH_PAD      0x3101
     
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257
+ +++#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI       0x0290
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO        0x0291
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS        0x0292