From: Antoine Jacquet <royale@zerezo.com>
Date: Sat, 26 Jan 2008 01:01:53 +0000 (-0300)
Subject: V4L/DVB (7080): zr364xx: add support for Pentax Optio 50
X-Git-Tag: v2.6.25-rc3~132^2~52
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=71c044752cdae89136862495f244d37073e2cf66;p=linux-2.6-omap-h63xx.git

V4L/DVB (7080): zr364xx: add support for Pentax Optio 50

Signed-off-by: Antoine Jacquet <royale@zerezo.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/Documentation/video4linux/zr364xx.txt b/Documentation/video4linux/zr364xx.txt
index 754099ce71b..9a1a8c55949 100644
--- a/Documentation/video4linux/zr364xx.txt
+++ b/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/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 1fdbb46de7f..d8f847edf01 100644
--- a/drivers/media/video/zr364xx.c
+++ b/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 */
 };