diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-13 20:03:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-13 20:03:00 -0200 |
| commit | 74b57f4ab6b40e070b7efb68b70f23c9be2dcf0f (patch) | |
| tree | 6d9d866435a2bd475fd342a009e7565f0b3fd965 /Documentation | |
| parent | 675c3c8ab2184d2d6ba5e0d7c3547edaa517b44f (diff) | |
| parent | 85f9b8d838c93aa2001c61c188553bcd2ed1c441 (diff) | |
Merge branch 'next' of ../devel
* 'next' of ../devel: (96 commits)
V4L/DVB (13969): frontends/si21xx.c: Remove #define TRUE/FALSE, use bool
V4L/DVB (13968): cx18, fix potential null dereference
V4L/DVB: ir: fix memory leak
V4L/DVB (13965): zl10039, jump to error on error
V4L/DVB (13964): tuner-core, fix memory leak
V4L/DVB (13963): siano, fix memory leak
V4L/DVB (12930): Wrong variable tested
V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini()
V4L/DVB (13959): cx23885/cx23885-dvb.c: use %pM to show MAC address
V4L/DVB (13958): tveeprom.c: use %pM to show MAC address
V4L/DVB (13957): IR: Fix sysfs attributes declaration
V4L/DVB (13956): fix weird array index in zl10036.c
V4L/DVB (13954): Correct NULL test
V4L/DVB (13953): firedtv: add missing NULL pointer check
V4L/DVB (13952): gspca: Storage class should be before const qualifier
V4L/DVB (13951): rj54n1cb0: Storage class should be before const qualifier
V4L/DVB (13950): usb-friio: Storage class should be before const qualifier
V4L/DVB (13949): Move a dereference below a NULL test
V4L/DVB (13948): radio: Correct use after free
V4L/DVB (13946): proc_fops: convert av7110
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
| -rw-r--r-- | Documentation/video4linux/gspca.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index fce1e7eb0474..b4a767060ed7 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 @@ -174,3 +174,4 @@ 173 -> Zolid Hybrid TV Tuner PCI [1131:2004] 174 -> Asus Europa Hybrid OEM [1043:4847] 175 -> Leadtek Winfast DTV1000S [107d:6655] +176 -> Beholder BeholdTV 505 RDS [0000:5051] diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 1800a62cf135..7b603439509d 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt @@ -109,6 +109,7 @@ sunplus 04a5:3003 Benq DC 1300 sunplus 04a5:3008 Benq DC 1500 sunplus 04a5:300a Benq DC 3410 spca500 04a5:300c Benq DC 1016 +benq 04a5:3035 Benq DC E300 finepix 04cb:0104 Fujifilm FinePix 4800 finepix 04cb:0109 Fujifilm FinePix A202 finepix 04cb:010b Fujifilm FinePix A203 @@ -142,6 +143,7 @@ sunplus 04fc:5360 Sunplus Generic spca500 04fc:7333 PalmPixDC85 sunplus 04fc:ffff Pure DigitalDakota spca501 0506:00df 3Com HomeConnect Lite +sunplus 052b:1507 Megapixel 5 Pretec DC-1007 sunplus 052b:1513 Megapix V4 sunplus 052b:1803 MegaImage VI tv8532 0545:808b Veo Stingray @@ -302,6 +304,7 @@ sonixj 0c45:613b Surfer SN-206 sonixj 0c45:613c Sonix Pccam168 sonixj 0c45:6143 Sonix Pccam168 sonixj 0c45:6148 Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia +sonixj 0c45:614a Frontech E-Ccam (JIL-2225) sn9c20x 0c45:6240 PC Camera (SN9C201 + MT9M001) sn9c20x 0c45:6242 PC Camera (SN9C201 + MT9M111) sn9c20x 0c45:6248 PC Camera (SN9C201 + OV9655) |