---

yaml --- r: 164918 b: refs/heads/master c: e7d7fcc h: refs/heads/master v: v3
git-mirror · Sep 23, 2009 · 0d91ce7 · 0d91ce7
1 parent 27f7b6f
commit 0d91ce7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5dc8ae121592239c2a2521d383bcb789849b2a3
+refs/heads/master: e7d7fcc09ebde1ea1773521ecab5a3f0ad6bef6e
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -702,6 +702,8 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
 	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+	{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
+	{ USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
 	{ },					/* Optional parameter entry */
 	{ }					/* Terminating entry */
 };

diff --git a/trunk/drivers/usb/serial/ftdi_sio.h b/trunk/drivers/usb/serial/ftdi_sio.h
@@ -967,6 +967,12 @@
  */
 #define MARVELL_OPENRD_PID	0x9e90
 
+/*
+ * Hameg HO820 and HO870 interface (using VID 0x0403)
+ */
+#define        HAMEG_HO820_PID         0xed74
+#define        HAMEG_HO870_PID         0xed71
+
 /*
  *   BmRequestType:  1100 0000b
  *   bRequest:       FTDI_E2_READ