---

yaml --- r: 124159 b: refs/heads/master c: 9171187 h: refs/heads/master i: 124157: bd08600 124155: 96f42da 124151: 871b51a 124143: 5ec7e27 124127: 455fcaa 124095: f164689 124031: 4259ab0 123903: 85b7539 v: v3
git-mirror · Dec 29, 2008 · f3ab620 · f3ab620
1 parent 96d8e59
commit f3ab620
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: 2e0903b00131e751ac91720162d62415613e9bc5
+refs/heads/master: 917118745a610765e98621c4a81d7744806e4954
diff --git a/trunk/Documentation/video4linux/gspca.txt b/trunk/Documentation/video4linux/gspca.txt
@@ -263,6 +263,7 @@ etoms		102c:6251	Qcam xxxxxx VGA
 zc3xx		10fd:0128	Typhoon Webshot II USB 300k 0x0128
 spca561		10fd:7e50	FlyCam Usb 100
 zc3xx		10fd:8050	Typhoon Webshot II USB 300k
+pac207		145f:013a	Trust WB-1300N
 spca501		1776:501c	Arowana 300K CMOS Camera
 t613		17a1:0128	TASCORP JPEG Webcam, NGS Cyclops
 vc032x		17ef:4802	Lenovo Vc0323+MI1310_SOC

diff --git a/trunk/drivers/media/video/gspca/pac207.c b/trunk/drivers/media/video/gspca/pac207.c
@@ -536,6 +536,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x093a, 0x2471)},
 	{USB_DEVICE(0x093a, 0x2472)},
 	{USB_DEVICE(0x093a, 0x2476)},
+	{USB_DEVICE(0x145f, 0x013a)},
 	{USB_DEVICE(0x2001, 0xf115)},
 	{}
 };