diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/hid-ids.h | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index ae8f74431d92..afbd82075f96 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -527,8 +527,10 @@ | |||
| 527 | 527 | ||
| 528 | #define USB_VENDOR_ID_UCLOGIC 0x5543 | 528 | #define USB_VENDOR_ID_UCLOGIC 0x5543 |
| 529 | #define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 0x0042 | 529 | #define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 0x0042 |
| 530 | #define USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U 0x0003 | ||
| 531 | #define USB_DEVICE_ID_UCLOGIC_TABLET_KNA5 0x6001 | 530 | #define USB_DEVICE_ID_UCLOGIC_TABLET_KNA5 0x6001 |
| 531 | #define USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U 0x0003 | ||
| 532 | #define USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U 0x0004 | ||
| 533 | #define USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U 0x0005 | ||
| 532 | 534 | ||
| 533 | #define USB_VENDOR_ID_VERNIER 0x08f7 | 535 | #define USB_VENDOR_ID_VERNIER 0x08f7 |
| 534 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 | 536 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 |