diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-28 21:54:25 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-28 21:54:25 -0600 |
| commit | 867f09ddc4c765a136402a0bd10a54ec45b7d820 (patch) | |
| tree | 64fe137c2c3ac2eee361ae8f4b7b6814719d2b8c /linux/Documentation | |
| parent | da1de2e42e2a5c0290c15edbbd4017176ff0b1c2 (diff) | |
| parent | fe57e9e343b68651e0666447d96d2db4fbb0a83d (diff) | |
| download | mediapointer-dvb-s2-867f09ddc4c765a136402a0bd10a54ec45b7d820.tar.gz mediapointer-dvb-s2-867f09ddc4c765a136402a0bd10a54ec45b7d820.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/Documentation')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 8c7195455..bca509032 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -52,7 +52,7 @@ 51 -> ProVideo PV952 [1540:9524] 52 -> AverMedia AverTV/305 [1461:2108] 53 -> ASUS TV-FM 7135 [1043:4845] - 54 -> LifeView FlyTV Platinum FM [5168:0214,1489:0214] + 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,1489:0214,5168:0304] 55 -> LifeView FlyDVB-T DUO [5168:0306] 56 -> Avermedia AVerTV 307 [1461:a70a] 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] @@ -84,7 +84,7 @@ 83 -> Terratec Cinergy 250 PCI TV [153b:1160] 84 -> LifeView FlyDVB Trio [5168:0319] 85 -> AverTV DVB-T 777 [1461:2c05] - 86 -> LifeView FlyDVB-T [5168:0301] + 86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion/KWorld DVB-T 220RF [17de:7201] 89 -> ELSA EX-VISION 700TV [1048:226c] @@ -92,3 +92,4 @@ 91 -> AVerMedia A169 B [1461:7360] 92 -> AVerMedia A169 B1 [1461:6360] 93 -> Medion 7134 Bridge #2 [16be:0005] + 94 -> LifeView FlyDVB-T Hybrid Cardbus [5168:3306,5168:3502] |