diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 02:33:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 02:33:02 -0300 |
| commit | a5f0c1eb5516fb321c59ba6adb6437288b5b20bf (patch) | |
| tree | 130b457eae2dd2e44bd82889b24c69d337682242 /linux/Documentation | |
| parent | 9469f9975ef9cd00fb23ec27109511c4b2a27350 (diff) | |
| parent | b08b8d66d6c66efb91344fad801cabb14ced6c33 (diff) | |
| download | mediapointer-dvb-s2-a5f0c1eb5516fb321c59ba6adb6437288b5b20bf.tar.gz mediapointer-dvb-s2-a5f0c1eb5516fb321c59ba6adb6437288b5b20bf.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dibcom
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.cx23885 | 1 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv index 4dfe62641..1da2c6271 100644 --- a/linux/Documentation/video4linux/CARDLIST.bttv +++ b/linux/Documentation/video4linux/CARDLIST.bttv @@ -155,3 +155,5 @@ 154 -> PHYTEC VD-012-X1 (bt878) 155 -> PHYTEC VD-012-X2 (bt878) 156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] +157 -> Geovision GV-800(S) (master) [800a:763d] +158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] diff --git a/linux/Documentation/video4linux/CARDLIST.cx23885 b/linux/Documentation/video4linux/CARDLIST.cx23885 index 5937ff958..91aa3c0f0 100644 --- a/linux/Documentation/video4linux/CARDLIST.cx23885 +++ b/linux/Documentation/video4linux/CARDLIST.cx23885 @@ -15,3 +15,4 @@ 14 -> TurboSight TBS 6920 [6920:8888] 15 -> TeVii S470 [d470:9022] 16 -> DVBWorld DVB-S2 2005 [0001:2005] + 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index b8d470596..325c69fe9 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -153,3 +153,5 @@ 152 -> Asus Tiger Rev:1.00 [1043:4857] 153 -> Kworld Plus TV Analog Lite PCI [17de:7128] 154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d] +155 -> Hauppauge WinTV-HVR1150 [0070:6706,0070:6708] +156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a] |