---

yaml --- r: 190453 b: refs/heads/master c: c3baa19 h: refs/heads/master i: 190451: 9b34730 v: v3
git-mirror · Apr 30, 2010 · 6a0de29 · 6a0de29
1 parent 3b3c160
commit 6a0de29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7fe7af146a7b613e36a311eefbbfb5555325d1
+refs/heads/master: c3baa19b0a9b711b02cec81d9fea33b7b9628957
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
@@ -1542,6 +1542,9 @@ static const struct usb_device_id acm_ids[] = {
 	{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
 	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
 	},
+	{ USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */
+	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
+	},
 
 	/* Nokia S60 phones expose two ACM channels. The first is
 	 * a modem and is picked up by the standard AT-command