From ed4de89c4b0b9c49d9e23c7ce46f807e507b57ed Mon Sep 17 00:00:00 2001 From: Antoine Jacquet Date: Mon, 25 Jun 2007 16:00:34 -0300 Subject: [PATCH] --- yaml --- r: 61347 b: refs/heads/master c: bebeaea0a54869b59b45ea22a93f325ce0369d61 h: refs/heads/master i: 61345: f4921f561dd9627bce41a6ac99abf42607d45870 61343: c6e23701f557c5368f66922f12d7c642efbd277c v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/zr364xx.txt | 2 +- trunk/drivers/media/video/zr364xx.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8574663830d3..a353e59a2e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea6337417da26a74a3b91c554ae9823995f8a84d +refs/heads/master: bebeaea0a54869b59b45ea22a93f325ce0369d61 diff --git a/trunk/Documentation/video4linux/zr364xx.txt b/trunk/Documentation/video4linux/zr364xx.txt index c76992d0ff4d..4d9a0c33f2fd 100644 --- a/trunk/Documentation/video4linux/zr364xx.txt +++ b/trunk/Documentation/video4linux/zr364xx.txt @@ -62,4 +62,4 @@ Vendor Product Distributor Model 0x0784 0x0040 Traveler Slimline X5 0x06d6 0x0034 Trust Powerc@m 750 0x0a17 0x0062 Pentax Optio 50L - +0x06d6 0x003b Trust Powerc@m 970Z diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c index ba469ec108c7..6f1892585cbb 100644 --- a/trunk/drivers/media/video/zr364xx.c +++ b/trunk/drivers/media/video/zr364xx.c @@ -92,6 +92,7 @@ static struct usb_device_id device_table[] = { {USB_DEVICE(0x0784, 0x0040), .driver_info = METHOD1 }, {USB_DEVICE(0x06d6, 0x0034), .driver_info = METHOD0 }, {USB_DEVICE(0x0a17, 0x0062), .driver_info = METHOD2 }, + {USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 }, {} /* Terminating entry */ };