summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Jacquet <royale@zerezo.com>2008-01-25 22:01:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 11:14:54 -0300
commit71c044752cdae89136862495f244d37073e2cf66 (patch)
treea3e1d880018f76f82f6c124bffe0021534f310ee
parente8e672c57736872ef0bd05640503ee04ff443890 (diff)
downloadkernel-crypto-71c044752cdae89136862495f244d37073e2cf66.tar.gz
kernel-crypto-71c044752cdae89136862495f244d37073e2cf66.tar.xz
kernel-crypto-71c044752cdae89136862495f244d37073e2cf66.zip
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>
-rw-r--r--Documentation/video4linux/zr364xx.txt1
-rw-r--r--drivers/media/video/zr364xx.c1
2 files changed, 2 insertions, 0 deletions
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 */
};