aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.saa71348
-rw-r--r--drivers/media/video/cx88/cx88-cards.c14
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c8
3 files changed, 15 insertions, 15 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 24a04af5d4b0..f31c2f8e4048 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -6,10 +6,10 @@
6 5 -> SKNet Monster TV [1131:4e85] 6 5 -> SKNet Monster TV [1131:4e85]
7 6 -> Tevion MD 9717 7 6 -> Tevion MD 9717
8 7 -> KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01] 8 7 -> KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01]
9 8 -> Terratec Cinergy 400 TV [153B:1142] 9 8 -> Terratec Cinergy 400 TV [153b:1142]
10 9 -> Medion 5044 10 9 -> Medion 5044
11 10 -> Kworld/KuroutoShikou SAA7130-TVPCI 11 10 -> Kworld/KuroutoShikou SAA7130-TVPCI
12 11 -> Terratec Cinergy 600 TV [153B:1143] 12 11 -> Terratec Cinergy 600 TV [153b:1143]
13 12 -> Medion 7134 [16be:0003] 13 12 -> Medion 7134 [16be:0003]
14 13 -> Typhoon TV+Radio 90031 14 13 -> Typhoon TV+Radio 90031
15 14 -> ELSA EX-VISION 300TV [1048:226b] 15 14 -> ELSA EX-VISION 300TV [1048:226b]
@@ -36,7 +36,7 @@
36 35 -> AverMedia AverTV Studio 305 [1461:2115] 36 35 -> AverMedia AverTV Studio 305 [1461:2115]
37 36 -> UPMOST PURPLE TV [12ab:0800] 37 36 -> UPMOST PURPLE TV [12ab:0800]
38 37 -> Items MuchTV Plus / IT-005 38 37 -> Items MuchTV Plus / IT-005
39 38 -> Terratec Cinergy 200 TV [153B:1152] 39 38 -> Terratec Cinergy 200 TV [153b:1152]
40 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212] 40 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212]
41 40 -> Compro VideoMate TV PVR/FM [185b:c100] 41 40 -> Compro VideoMate TV PVR/FM [185b:c100]
42 41 -> Compro VideoMate TV Gold+ [185b:c100] 42 41 -> Compro VideoMate TV Gold+ [185b:c100]
@@ -46,7 +46,7 @@
46 45 -> Avermedia AVerTV Studio 307 [1461:9715] 46 45 -> Avermedia AVerTV Studio 307 [1461:9715]
47 46 -> AVerMedia Cardbus TV/Radio (E500) [1461:d6ee] 47 46 -> AVerMedia Cardbus TV/Radio (E500) [1461:d6ee]
48 47 -> Terratec Cinergy 400 mobile [153b:1162] 48 47 -> Terratec Cinergy 400 mobile [153b:1162]
49 48 -> Terratec Cinergy 600 TV MK3 [153B:1158] 49 48 -> Terratec Cinergy 600 TV MK3 [153b:1158]
50 49 -> Compro VideoMate Gold+ Pal [185b:c200] 50 49 -> Compro VideoMate Gold+ Pal [185b:c200]
51 50 -> Pinnacle PCTV 300i DVB-T + PAL [11bd:002d] 51 50 -> Pinnacle PCTV 300i DVB-T + PAL [11bd:002d]
52 51 -> ProVideo PV952 [1540:9524] 52 51 -> ProVideo PV952 [1540:9524]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 8d840afc745d..5a85802047f9 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -879,8 +879,8 @@ struct cx88_subid cx88_subids[] = {
879 .subdevice = 0xd820, 879 .subdevice = 0xd820,
880 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T, 880 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T,
881 },{ 881 },{
882 .subvendor = 0x18AC, 882 .subvendor = 0x18ac,
883 .subdevice = 0xDB00, 883 .subdevice = 0xdb00,
884 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1, 884 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1,
885 },{ 885 },{
886 .subvendor = 0x0070, 886 .subvendor = 0x0070,
@@ -895,8 +895,8 @@ struct cx88_subid cx88_subids[] = {
895 .subdevice = 0x2580, 895 .subdevice = 0x2580,
896 .card = CX88_BOARD_PROVIDEO_PV259, 896 .card = CX88_BOARD_PROVIDEO_PV259,
897 },{ 897 },{
898 .subvendor = 0x18AC, 898 .subvendor = 0x18ac,
899 .subdevice = 0xDB10, 899 .subdevice = 0xdb10,
900 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, 900 .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
901 },{ 901 },{
902 .subvendor = 0x1554, 902 .subvendor = 0x1554,
@@ -907,15 +907,15 @@ struct cx88_subid cx88_subids[] = {
907 .subdevice = 0x3000, /* HD-3000 card */ 907 .subdevice = 0x3000, /* HD-3000 card */
908 .card = CX88_BOARD_PCHDTV_HD3000, 908 .card = CX88_BOARD_PCHDTV_HD3000,
909 },{ 909 },{
910 .subvendor = 0x17DE, 910 .subvendor = 0x17de,
911 .subdevice = 0xA8A6, 911 .subdevice = 0xa8a6,
912 .card = CX88_BOARD_DNTV_LIVE_DVB_T, 912 .card = CX88_BOARD_DNTV_LIVE_DVB_T,
913 },{ 913 },{
914 .subvendor = 0x0070, 914 .subvendor = 0x0070,
915 .subdevice = 0x2801, 915 .subdevice = 0x2801,
916 .card = CX88_BOARD_HAUPPAUGE_ROSLYN, 916 .card = CX88_BOARD_HAUPPAUGE_ROSLYN,
917 },{ 917 },{
918 .subvendor = 0x14F1, 918 .subvendor = 0x14f1,
919 .subdevice = 0x0342, 919 .subdevice = 0x0342,
920 .card = CX88_BOARD_DIGITALLOGIC_MEC, 920 .card = CX88_BOARD_DIGITALLOGIC_MEC,
921 },{ 921 },{
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 9491999e6329..bca5b7038a8c 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2176,19 +2176,19 @@ struct pci_device_id saa7134_pci_tbl[] = {
2176 },{ 2176 },{
2177 .vendor = PCI_VENDOR_ID_PHILIPS, 2177 .vendor = PCI_VENDOR_ID_PHILIPS,
2178 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2178 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2179 .subvendor = 0x153B, 2179 .subvendor = 0x153b,
2180 .subdevice = 0x1142, 2180 .subdevice = 0x1142,
2181 .driver_data = SAA7134_BOARD_CINERGY400, 2181 .driver_data = SAA7134_BOARD_CINERGY400,
2182 },{ 2182 },{
2183 .vendor = PCI_VENDOR_ID_PHILIPS, 2183 .vendor = PCI_VENDOR_ID_PHILIPS,
2184 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2184 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2185 .subvendor = 0x153B, 2185 .subvendor = 0x153b,
2186 .subdevice = 0x1143, 2186 .subdevice = 0x1143,
2187 .driver_data = SAA7134_BOARD_CINERGY600, 2187 .driver_data = SAA7134_BOARD_CINERGY600,
2188 },{ 2188 },{
2189 .vendor = PCI_VENDOR_ID_PHILIPS, 2189 .vendor = PCI_VENDOR_ID_PHILIPS,
2190 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2190 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
2191 .subvendor = 0x153B, 2191 .subvendor = 0x153b,
2192 .subdevice = 0x1158, 2192 .subdevice = 0x1158,
2193 .driver_data = SAA7134_BOARD_CINERGY600_MK3, 2193 .driver_data = SAA7134_BOARD_CINERGY600_MK3,
2194 },{ 2194 },{
@@ -2406,7 +2406,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
2406 },{ 2406 },{
2407 .vendor = PCI_VENDOR_ID_PHILIPS, 2407 .vendor = PCI_VENDOR_ID_PHILIPS,
2408 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 2408 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
2409 .subvendor = 0x153B, 2409 .subvendor = 0x153b,
2410 .subdevice = 0x1152, 2410 .subdevice = 0x1152,
2411 .driver_data = SAA7134_BOARD_CINERGY200, 2411 .driver_data = SAA7134_BOARD_CINERGY200,
2412 },{ 2412 },{