diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 11:41:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 11:41:56 -0400 |
| commit | f45471cbda9df24f990154a963741c9bd4c0b0aa (patch) | |
| tree | 145ed5450efae53f73ae0dca263b84688d6b97ca /drivers/hid/hid-ids.h | |
| parent | 2214482cb00e6da1397c2ecde5b392490eb9637f (diff) | |
| parent | 0e927bfc87037c1f44d6b61be12c36f6215ee5b2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: roccat: fix build failure if built as module
HID: roccat: propagate special events of roccat hardware to userspace
HID: Add the GYR4101US USB ID to hid-gyration
HID: fix hid-roccat-kone for bin_attr API change
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 9776896cc4fc..6af77ed0b555 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -282,6 +282,7 @@ | |||
| 282 | #define USB_VENDOR_ID_GYRATION 0x0c16 | 282 | #define USB_VENDOR_ID_GYRATION 0x0c16 |
| 283 | #define USB_DEVICE_ID_GYRATION_REMOTE 0x0002 | 283 | #define USB_DEVICE_ID_GYRATION_REMOTE 0x0002 |
| 284 | #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 | 284 | #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 |
| 285 | #define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 | ||
| 285 | 286 | ||
| 286 | #define USB_VENDOR_ID_HAPP 0x078b | 287 | #define USB_VENDOR_ID_HAPP 0x078b |
| 287 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 | 288 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 |