Merge branch 'upstream-fixes' into for-next

[linux-2.6-omap-h63xx.git] / drivers / hid / hid-ids.h

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index daced0bf9d4938fc91f8b6e80e508596c5be4ee3..acc1abc834a471e1cf61789950a027b8c6c1e7ab 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -138,6 +138,9 @@
 #define USB_DEVICE_ID_CYPRESS_BARCODE_1        0xde61
 #define USB_DEVICE_ID_CYPRESS_BARCODE_2        0xde64
 
+#define USB_VENDOR_ID_DEALEXTREAME     0x10c5
+#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701        0x819a
+
 #define USB_VENDOR_ID_DELORME          0x1163
 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
 #define USB_DEVICE_ID_DELORME_EM_LT20  0x0200
@@ -381,6 +384,9 @@
 #define USB_VENDOR_ID_TURBOX           0x062a
 #define USB_DEVICE_ID_TURBOX_KEYBOARD  0x0201
 
+#define USB_VENDOR_ID_UCLOGIC          0x5543
+#define USB_DEVICE_ID_UCLOGIC_TABLET_PF1209    0x0042
+
 #define USB_VENDOR_ID_VERNIER          0x08f7
 #define USB_DEVICE_ID_VERNIER_LABPRO   0x0001
 #define USB_DEVICE_ID_VERNIER_GOTEMP   0x0002