From c93ae4cea3c0d684ed1607dec58b733434f8583a Mon Sep 17 00:00:00 2001
From: Antoine Jacquet <royale@zerezo.com>
Date: Sat, 17 Jan 2009 22:49:08 -0300
Subject: [PATCH] --- yaml --- r: 137709 b: refs/heads/master c:
 c76b638ca20d6cbf91ee017c6f2afd7d3fcd57ff h: refs/heads/master i:   137707:
 6437f50d44fec33a7d6f5494776f3e9370a56ed2 v: v3

---
 [refs]                                      | 2 +-
 trunk/Documentation/video4linux/zr364xx.txt | 1 +
 trunk/drivers/media/video/zr364xx.c         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1314e90e0e0..896593851bcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b5ff9cf3edf06e0666fea87398a7fff98a15a4
+refs/heads/master: c76b638ca20d6cbf91ee017c6f2afd7d3fcd57ff
diff --git a/trunk/Documentation/video4linux/zr364xx.txt b/trunk/Documentation/video4linux/zr364xx.txt
index 5c81e3ae6458..7f3d1955d214 100644
--- a/trunk/Documentation/video4linux/zr364xx.txt
+++ b/trunk/Documentation/video4linux/zr364xx.txt
@@ -65,3 +65,4 @@ Vendor  Product  Distributor     Model
 0x06d6  0x003b   Trust           Powerc@m 970Z
 0x0a17  0x004e   Pentax          Optio 50
 0x041e  0x405d   Creative        DiVi CAM 516
+0x08ca  0x2102   Aiptek          DV T300
diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c
index 93023560f324..f2f8cdd71c46 100644
--- a/trunk/drivers/media/video/zr364xx.c
+++ b/trunk/drivers/media/video/zr364xx.c
@@ -96,6 +96,7 @@ static struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
 	{USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
 	{USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 },
+	{USB_DEVICE(0x08ca, 0x2102), .driver_info = METHOD2 },
 	{}			/* Terminating entry */
 };