diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 21:11:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 21:11:02 -0500 |
| commit | 9b4d142d521963ee1c53cefcd1f9790ca32b5db7 (patch) | |
| tree | 2f302aa25a5b1209932335110f9e5138dd95d824 /drivers/hid/hid-ids.h | |
| parent | 6e3eed9850064e38a98851ff91534bb32438b292 (diff) | |
| parent | bae7eb33b25387fdc7ccae08768bef1f9484a5b0 (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: document difference between hid_blacklist and hid_ignore_list
HID: add antec-branded soundgraph imon devices to blacklist
HID: fix reversed logic in disconnect testing of hiddev
HID: adjust report descriptor fixup for MS 1028 receiver
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index acc1abc834a4..e899f510ebeb 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -362,6 +362,8 @@ | |||
| 362 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD 0x0038 | 362 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD 0x0038 |
| 363 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2 0x0036 | 363 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2 0x0036 |
| 364 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3 0x0034 | 364 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3 0x0034 |
| 365 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4 0x0044 | ||
| 366 | #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5 0x0045 | ||
| 365 | 367 | ||
| 366 | #define USB_VENDOR_ID_SUN 0x0430 | 368 | #define USB_VENDOR_ID_SUN 0x0430 |
| 367 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab | 369 | #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab |