---

yaml --- r: 85713 b: refs/heads/master c: c0e0aff h: refs/heads/master i: 85711: f145a44 v: v3
git-mirror · Feb 18, 2008 · 0334491 · 0334491
1 parent 996de1b
commit 0334491
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71c044752cdae89136862495f244d37073e2cf66
+refs/heads/master: c0e0aff9779303c7e3ef7e6db4001dbc2bfdcbdd
diff --git a/trunk/Documentation/video4linux/zr364xx.txt b/trunk/Documentation/video4linux/zr364xx.txt
@@ -64,3 +64,4 @@ Vendor  Product  Distributor     Model
 0x0a17  0x0062   Pentax          Optio 50L
 0x06d6  0x003b   Trust           Powerc@m 970Z
 0x0a17  0x004e   Pentax          Optio 50
+0x041e  0x405d   Creative        DiVi CAM 516
diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c
@@ -94,6 +94,7 @@ static struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x0a17, 0x0062), .driver_info = METHOD2 },
 	{USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
 	{USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
+	{USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 },
 	{}			/* Terminating entry */
 };