From 996de1bc6b8205e7e6f3228c3aaf8bab607ca190 Mon Sep 17 00:00:00 2001
From: Antoine Jacquet <royale@zerezo.com>
Date: Fri, 25 Jan 2008 22:01:53 -0300
Subject: [PATCH] --- yaml --- r: 85712 b: refs/heads/master c:
 71c044752cdae89136862495f244d37073e2cf66 h: refs/heads/master 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 a2719a9fb57f..722028aa6d36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8e672c57736872ef0bd05640503ee04ff443890
+refs/heads/master: 71c044752cdae89136862495f244d37073e2cf66
diff --git a/trunk/Documentation/video4linux/zr364xx.txt b/trunk/Documentation/video4linux/zr364xx.txt
index 754099ce71b6..9a1a8c559490 100644
--- a/trunk/Documentation/video4linux/zr364xx.txt
+++ b/trunk/Documentation/video4linux/zr364xx.txt
@@ -63,3 +63,4 @@ Vendor  Product  Distributor     Model
 0x06d6  0x0034   Trust           Powerc@m 750
 0x0a17  0x0062   Pentax          Optio 50L
 0x06d6  0x003b   Trust           Powerc@m 970Z
+0x0a17  0x004e   Pentax          Optio 50
diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c
index 1fdbb46de7f3..d8f847edf017 100644
--- a/trunk/drivers/media/video/zr364xx.c
+++ b/trunk/drivers/media/video/zr364xx.c
@@ -93,6 +93,7 @@ static struct usb_device_id device_table[] = {
 	{USB_DEVICE(0x06d6, 0x0034), .driver_info = METHOD0 },
 	{USB_DEVICE(0x0a17, 0x0062), .driver_info = METHOD2 },
 	{USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
+	{USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
 	{}			/* Terminating entry */
 };