aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 617c7572c001..7d163763d4b0 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -75,7 +75,7 @@
75 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] 75 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212]
76 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044]
77 76 -> SKNet MonsterTV Mobile [1131:4ee9] 77 76 -> SKNet MonsterTV Mobile [1131:4ee9]
78 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 78 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e]
79 78 -> ASUSTeK P7131 Dual [1043:4862] 79 78 -> ASUSTeK P7131 Dual [1043:4862]
80 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
81 80 -> ASUS Digimatrix TV [1043:0210] 81 80 -> ASUS Digimatrix TV [1043:0210]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index f5c79898fcfb..602c614d74c5 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2418,7 +2418,7 @@ struct saa7134_board saa7134_boards[] = {
2418 }}, 2418 }},
2419 }, 2419 },
2420 [SAA7134_BOARD_PINNACLE_PCTV_110i] = { 2420 [SAA7134_BOARD_PINNACLE_PCTV_110i] = {
2421 .name = "Pinnacle PCTV 110i (saa7133)", 2421 .name = "Pinnacle PCTV 40i/50i/110i (saa7133)",
2422 .audio_clock = 0x00187de7, 2422 .audio_clock = 0x00187de7,
2423 .tuner_type = TUNER_PHILIPS_TDA8290, 2423 .tuner_type = TUNER_PHILIPS_TDA8290,
2424 .radio_type = UNSET, 2424 .radio_type = UNSET,
@@ -2433,6 +2433,10 @@ struct saa7134_board saa7134_boards[] = {
2433 },{ 2433 },{
2434 .name = name_comp1, 2434 .name = name_comp1,
2435 .vmux = 1, 2435 .vmux = 1,
2436 .amux = LINE2,
2437 },{
2438 .name = name_comp2,
2439 .vmux = 0,
2436 .amux = LINE2, 2440 .amux = LINE2,
2437 },{ 2441 },{
2438 .name = name_svideo, 2442 .name = name_svideo,