diff options
author | Patrick Boettcher <pb@linuxtv.org> | 2006-10-19 10:18:14 +0200 |
---|---|---|
committer | Patrick Boettcher <pb@linuxtv.org> | 2006-10-19 10:18:14 +0200 |
commit | bc8fe4ca7a4a0540f44765741d616006b020caa6 (patch) | |
tree | b23aa61485b18a3dd9245db9650e9e04a3ee1d68 /linux/Documentation | |
parent | ae62c320fe11be6e35fec09abfc00ae17eefab43 (diff) | |
parent | 3861ba7353e0a787c17b86bf488880a234a1f817 (diff) | |
download | mediapointer-dvb-s2-bc8fe4ca7a4a0540f44765741d616006b020caa6.tar.gz mediapointer-dvb-s2-bc8fe4ca7a4a0540f44765741d616006b020caa6.tar.bz2 |
merge from main
From: Patrick Boettcher <pb@linuxtv.org>
merge from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/Documentation')
-rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 8be8f9738..a9bffd9a3 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -76,7 +76,7 @@ 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] - 78 -> ASUSTeK P7131 Dual [1043:4862] + 78 -> ASUSTeK P7131 Dual [1043:4862,1043:4876] 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210] 81 -> Philips Tiger reference design [1131:2018] |