diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:06:41 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-04-01 19:06:41 +0200 |
| commit | 6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 (patch) | |
| tree | 418b338bcb2014768ede10e73179c7afbaf1736d /drivers/hid/hid-ids.h | |
| parent | ded75664d1a7d74c1976da0969ddb31ad9839d4c (diff) | |
| parent | 34e75dca4e6313249c9a2faa8effeddce89b91ac (diff) | |
| download | linux-6cf8c85f8bc320ca0273c5261cc13ee1491d7b92.tar.bz2 | |
Merge branch 'for-3.15/microsoft' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5c34e658fd59..af15a631bb24 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -615,6 +615,7 @@ #define USB_VENDOR_ID_MICROSOFT 0x045e #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b +#define USB_DEVICE_ID_MS_OFFICE_KB 0x0048 #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d #define USB_DEVICE_ID_MS_NE4K 0x00db #define USB_DEVICE_ID_MS_NE4K_JP 0x00dc |