From f3ab620f97dcb258ab299c2d96a11f96ea0fe268 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Tue, 28 Oct 2008 08:00:23 -0300
Subject: [PATCH] --- yaml --- r: 124159 b: refs/heads/master c:
 917118745a610765e98621c4a81d7744806e4954 h: refs/heads/master i:   124157:
 bd086009b6084d2cad71c126c4f676e3186b4e91   124155:
 96f42daf8356626162f6d519e864e0d9f5f4db8f   124151:
 871b51a4cf49444769e32b30c73a31b95c686f5c   124143:
 5ec7e276e7d926ab9da3fa38b016bda8fe451da8   124127:
 455fcaadacd5cc18b89e70b1523b1b0e092aaae5   124095:
 f1646895bdf26b11b57bf25c45c83b924e138435   124031:
 4259ab068da0ee576f6a56d3ca957a66dc2b6dfe   123903:
 85b7539ed3a0ddff9ae94a6a53567e1135b2094c v: v3

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

diff --git a/[refs] b/[refs]
index a36dcb32e91b..2201ae876e61 100644
--- 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
index 004818fab040..2a23fe31e0ef 100644
--- 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
index 0b0c573d06da..39473e6b9140 100644
--- 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)},
 	{}
 };