diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /Documentation/video4linux/CARDLIST.saa7134 | |
parent | wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h (diff) | |
parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
download | linux-dev-0c168775709faa74c1b87f1e61046e0c51ade7f3.tar.xz linux-dev-0c168775709faa74c1b87f1e61046e0c51ade7f3.zip |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'Documentation/video4linux/CARDLIST.saa7134')
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index d5ed95d28500..735e8ba02d9f 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 @@ -54,3 +54,9 @@ 55 -> LifeView FlyDVB-T DUO [5168:0306] 56 -> Avermedia AVerTV 307 [1461:a70a] 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] + 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0370] + 59 -> Kworld/Tevion V-Stream Xpert TV PVR7134 + 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus + 61 -> Philips TOUGH DVB-T reference design + 62 -> Compro VideoMate TV Gold+II + 63 -> Kworld Xpert TV PVR7134 |