diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:54:53 -0400 |
| commit | f1275410a108ac38b59149d10bce3f35edd70876 (patch) | |
| tree | e86e0bab91fd1c2faa678b2c2c8442019bf4f92a /drivers/hid/hid-ids.h | |
| parent | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (diff) | |
| parent | 00e7f9649b3061281fe4b463263da26155dc9be4 (diff) | |
Merge branch 'waltop' into for-linus
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index afbd82075f96..3ee999d33004 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -542,6 +542,12 @@ | |||
| 542 | #define USB_VENDOR_ID_WACOM 0x056a | 542 | #define USB_VENDOR_ID_WACOM 0x056a |
| 543 | #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81 | 543 | #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81 |
| 544 | 544 | ||
| 545 | #define USB_VENDOR_ID_WALTOP 0x172f | ||
| 546 | #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH 0x0032 | ||
| 547 | #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH 0x0034 | ||
| 548 | #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501 | ||
| 549 | #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH 0x0500 | ||
| 550 | |||
| 545 | #define USB_VENDOR_ID_WISEGROUP 0x0925 | 551 | #define USB_VENDOR_ID_WISEGROUP 0x0925 |
| 546 | #define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005 | 552 | #define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005 |
| 547 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 | 553 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 |