diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-02 11:19:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-02 11:19:42 -0300 |
| commit | 7626144ace9fbb7b98d1f581c8c2b415e59d606e (patch) | |
| tree | 46109dd7851da3c9197012fe72692891ae6e35dc /linux/Documentation/video4linux | |
| parent | d2c59cfc5b82e105272495a6502096ad6434064f (diff) | |
| parent | 2a3699c7aea27b7c2c464e29e0b75b4f433f2d5a (diff) | |
| download | mediapointer-dvb-s2-7626144ace9fbb7b98d1f581c8c2b415e59d606e.tar.gz mediapointer-dvb-s2-7626144ace9fbb7b98d1f581c8c2b415e59d606e.tar.bz2 | |
Merging endriss tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/Documentation/video4linux')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index e1484dfef..17ea5a031 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/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 @@ -87,5 +87,5 @@ 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] - 89 -> ELSA EX-VISION 700TV [1131:7130] + 89 -> ELSA EX-VISION 700TV [1048:226c] 90 -> Kworld ATSC110 [17de:7350] |