diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/hid/hid-ids.h | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d91bb12f9c54..5cd1a6a356a3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -309,6 +309,10 @@ | |||
| 309 | #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 | 309 | #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 |
| 310 | #define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 | 310 | #define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008 |
| 311 | 311 | ||
| 312 | #define USB_VENDOR_ID_HANWANG 0x0b57 | ||
| 313 | #define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000 | ||
| 314 | #define USB_DEVICE_ID_HANWANG_TABLET_LAST 0x8fff | ||
| 315 | |||
| 312 | #define USB_VENDOR_ID_HAPP 0x078b | 316 | #define USB_VENDOR_ID_HAPP 0x078b |
| 313 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 | 317 | #define USB_DEVICE_ID_UGCI_DRIVING 0x0010 |
| 314 | #define USB_DEVICE_ID_UGCI_FLYING 0x0020 | 318 | #define USB_DEVICE_ID_UGCI_FLYING 0x0020 |