Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / hid / hid-ids.h

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e715c43..0b374a6 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -380,19 +380,38 @@
 
 #define USB_VENDOR_ID_LD               0x0f11
 #define USB_DEVICE_ID_LD_CASSY         0x1000
+#define USB_DEVICE_ID_LD_CASSY2                0x1001
 #define USB_DEVICE_ID_LD_POCKETCASSY   0x1010
+#define USB_DEVICE_ID_LD_POCKETCASSY2  0x1011
 #define USB_DEVICE_ID_LD_MOBILECASSY   0x1020
+#define USB_DEVICE_ID_LD_MOBILECASSY2  0x1021
+#define USB_DEVICE_ID_LD_MICROCASSYVOLTAGE     0x1031
+#define USB_DEVICE_ID_LD_MICROCASSYCURRENT     0x1032
+#define USB_DEVICE_ID_LD_MICROCASSYTIME                0x1033
+#define USB_DEVICE_ID_LD_MICROCASSYTEMPERATURE 0x1035
+#define USB_DEVICE_ID_LD_MICROCASSYPH          0x1038
 #define USB_DEVICE_ID_LD_JWM           0x1080
 #define USB_DEVICE_ID_LD_DMMP          0x1081
 #define USB_DEVICE_ID_LD_UMIP          0x1090
-#define USB_DEVICE_ID_LD_XRAY1         0x1100
+#define USB_DEVICE_ID_LD_UMIC          0x10A0
+#define USB_DEVICE_ID_LD_UMIB          0x10B0
+#define USB_DEVICE_ID_LD_XRAY          0x1100
 #define USB_DEVICE_ID_LD_XRAY2         0x1101
+#define USB_DEVICE_ID_LD_XRAYCT                0x1110
 #define USB_DEVICE_ID_LD_VIDEOCOM      0x1200
+#define USB_DEVICE_ID_LD_MOTOR         0x1210
 #define USB_DEVICE_ID_LD_COM3LAB       0x2000
 #define USB_DEVICE_ID_LD_TELEPORT      0x2010
 #define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020
 #define USB_DEVICE_ID_LD_POWERCONTROL  0x2030
 #define USB_DEVICE_ID_LD_MACHINETEST   0x2040
+#define USB_DEVICE_ID_LD_MOSTANALYSER  0x2050
+#define USB_DEVICE_ID_LD_MOSTANALYSER2 0x2051
+#define USB_DEVICE_ID_LD_ABSESP                0x2060
+#define USB_DEVICE_ID_LD_AUTODATABUS   0x2070
+#define USB_DEVICE_ID_LD_MCT           0x2080
+#define USB_DEVICE_ID_LD_HYBRID                0x2090
+#define USB_DEVICE_ID_LD_HEATCONTROL   0x20A0
 
 #define USB_VENDOR_ID_LOGITECH         0x046d
 #define USB_DEVICE_ID_LOGITECH_RECEIVER        0xc101