diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 07:50:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 07:50:50 -0300 |
| commit | fa78f832b219585b0c8df60fa718e52ae8212bdd (patch) | |
| tree | 0df6d1f161db342e30b3adc6d724a6e4736b9760 /linux/Documentation | |
| parent | aa7df40721e36bcf9d4f1a60b9e58e69c08aac48 (diff) | |
| parent | 8b5e9c7eff25fa9a8405ab96c815109f6e2eb059 (diff) | |
| download | mediapointer-dvb-s2-fa78f832b219585b0c8df60fa718e52ae8212bdd.tar.gz mediapointer-dvb-s2-fa78f832b219585b0c8df60fa718e52ae8212bdd.tar.bz2 | |
merge: http://www.kernellabs.com/hg/~dheitmueller/geniatech_x8000
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] |