diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-18 23:20:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-18 23:20:02 -0200 |
| commit | d47e355a4e899c551dced722b6126233968900f4 (patch) | |
| tree | 8369eacf3c9de56e3d44c9e2eb92bea098ded98b | |
| parent | bdfe31cd2515c9c28375bce881f8de58df410a9f (diff) | |
| parent | 0a0f4eb7b07e6f4e0d49fa3f44b8d4a9d0724102 (diff) | |
| download | mediapointer-dvb-s2-d47e355a4e899c551dced722b6126233968900f4.tar.gz mediapointer-dvb-s2-d47e355a4e899c551dced722b6126233968900f4.tar.bz2 | |
merge: http://linuxtv.org/hg/~ajacquet/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/Documentation/video4linux/zr364xx.txt | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/zr364xx.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/zr364xx.txt b/linux/Documentation/video4linux/zr364xx.txt index 5c81e3ae6..7f3d1955d 100644 --- a/linux/Documentation/video4linux/zr364xx.txt +++ b/linux/Documentation/video4linux/zr364xx.txt @@ -65,3 +65,4 @@ Vendor Product Distributor Model 0x06d6 0x003b Trust Powerc@m 970Z 0x0a17 0x004e Pentax Optio 50 0x041e 0x405d Creative DiVi CAM 516 +0x08ca 0x2102 Aiptek DV T300 diff --git a/linux/drivers/media/video/zr364xx.c b/linux/drivers/media/video/zr364xx.c index 6bd4d6a14..698b7b9ba 100644 --- a/linux/drivers/media/video/zr364xx.c +++ b/linux/drivers/media/video/zr364xx.c @@ -97,6 +97,7 @@ static struct usb_device_id device_table[] = { {USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 }, {USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 }, {USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 }, + {USB_DEVICE(0x08ca, 0x2102), .driver_info = METHOD2 }, {} /* Terminating entry */ }; |