diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-03 16:17:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-03 16:17:43 -0300 |
| commit | 8e2cc1af9fa067fe49c639ee5e5e07c96a54fe49 (patch) | |
| tree | 59ef18daded159b90ad2478cca754409545b7cb1 /Documentation | |
| parent | c499ec24c31edf270e777a868ffd0daddcfe7ebd (diff) | |
| parent | be6f655d03d2e166134da2ea3c9360c4fe008744 (diff) | |
| download | lwn-8e2cc1af9fa067fe49c639ee5e5e07c96a54fe49.tar.gz lwn-8e2cc1af9fa067fe49c639ee5e5e07c96a54fe49.zip | |
Merge branch 'work-fixes'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dvb/bt8xx.txt | 6 | ||||
| -rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt index df6c05453cb5..52ed462061df 100644 --- a/Documentation/dvb/bt8xx.txt +++ b/Documentation/dvb/bt8xx.txt @@ -111,4 +111,8 @@ source: linux/Documentation/video4linux/CARDLIST.bttv If you have problems with this please do ask on the mailing list. -- -Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham +Authors: Richard Walker, + Jamie Honan, + Michael Hunold, + Manu Abraham, + Michael Krufky diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 8a352597830f..da4fb890165f 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 @@ -13,7 +13,7 @@ 12 -> Medion 7134 [16be:0003] 13 -> Typhoon TV+Radio 90031 14 -> ELSA EX-VISION 300TV [1048:226b] - 15 -> ELSA EX-VISION 500TV [1048:226b] + 15 -> ELSA EX-VISION 500TV [1048:226a] 16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840] 17 -> AOPEN VA1000 POWER [1131:7133] 18 -> BMK MPEX No Tuner @@ -75,7 +75,7 @@ 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] - 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] + 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210] |