diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 08:12:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 08:12:07 -0300 |
| commit | 18c7475db040fb0ed62df174b6831aea290f2479 (patch) | |
| tree | 5a79d04339d7d6289fc5acc3921032b999884004 /linux/Documentation | |
| parent | fbcd7beea764d905edd7aec98388395e0d112a9d (diff) | |
| parent | fa78f832b219585b0c8df60fa718e52ae8212bdd (diff) | |
| download | mediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.gz mediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.bz2 | |
merge: http://kernellabs.com/hg/~pboettcher/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
| -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 15562427e..c913e5614 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -153,8 +153,8 @@ 152 -> Asus Tiger Rev:1.00 [1043:4857] 153 -> Kworld Plus TV Analog Lite PCI [17de:7128] 154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d] -155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid [0070:6706,0070:6708] -156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a] +155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708] +156 -> Hauppauge WinTV-HVR1120 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a] 157 -> Avermedia AVerTV Studio 507UA [1461:a11b] 158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9] 159 -> Beholder BeholdTV 505 RDS [0000:505B] |