aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-01-03 19:04:09 -0500
committerJiri Kosina <jkosina@suse.cz>2009-01-03 19:04:09 -0500
commited42350e02bfcb333024949e9653d06916135cc5 (patch)
tree08e2ff6c3cb90193677e67b1f23b85d1ba775f74 /drivers/hid/hid-ids.h
parent1db489b2953799d41098a891c85dea02e3c4721a (diff)
parent4dfdc46468a142216b284eea66040f49df3f7191 (diff)
Merge branch 'upstream-fixes' into for-next
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index daced0bf9d49..acc1abc834a4 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -138,6 +138,9 @@
138#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61 138#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
139#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64 139#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
140 140
141#define USB_VENDOR_ID_DEALEXTREAME 0x10c5
142#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a
143
141#define USB_VENDOR_ID_DELORME 0x1163 144#define USB_VENDOR_ID_DELORME 0x1163
142#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 145#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
143#define USB_DEVICE_ID_DELORME_EM_LT20 0x0200 146#define USB_DEVICE_ID_DELORME_EM_LT20 0x0200
@@ -381,6 +384,9 @@
381#define USB_VENDOR_ID_TURBOX 0x062a 384#define USB_VENDOR_ID_TURBOX 0x062a
382#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 385#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201
383 386
387#define USB_VENDOR_ID_UCLOGIC 0x5543
388#define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209 0x0042
389
384#define USB_VENDOR_ID_VERNIER 0x08f7 390#define USB_VENDOR_ID_VERNIER 0x08f7
385#define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 391#define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
386#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 392#define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002