1 files changed, 47 insertions, 5 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 1d6a245c828f..187cc48d0924 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -1,17 +1,59 @@
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]
-  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
+  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]
  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]
  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]
  5 -> MSI VOX USB 2.0                          (em2820/em2840)
  6 -> Terratec Cinergy 200 USB                 (em2800)
-  7 -> Leadtek Winfast USB II                   (em2800)
+  7 -> Leadtek Winfast USB II                   (em2800)        [0413:6023]
  8 -> Kworld USB2800                           (em2800)
  9 -> Pinnacle Dazzle DVC 90/DVC 100           (em2820/em2840) [2304:0207,2304:021a]
- 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500,2040:6502]
+ 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]
 11 -> Terratec Hybrid XS                       (em2880)        [0ccd:0042]
 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)
 13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]
- 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)
+ 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840) [eb1a:2821]
 15 -> V-Gear PocketTV                          (em2800)
- 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513,2040:6517,2040:651b,2040:651f]
+ 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]
+ 17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]
+ 18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]
+ 19 -> PointNix Intra-Oral Camera               (em2860)
+ 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]
+ 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]
+ 22 -> Unknown EM2750/EM2751 webcam grabber     (em2750)        [eb1a:2750,eb1a:2751]
+ 23 -> Huaqi DLCW-130                           (em2750)
+ 24 -> D-Link DUB-T210 TV Tuner                 (em2820/em2840) [2001:f112]
+ 25 -> Gadmei UTV310                            (em2820/em2840)
+ 26 -> Hercules Smart TV USB 2.0                (em2820/em2840)
+ 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME)   (em2820/em2840)
+ 28 -> Leadtek Winfast USB II Deluxe            (em2820/em2840)
+ 29 -> Pinnacle Dazzle DVC 100                  (em2820/em2840)
+ 30 -> Videology 20K14XUSB USB2.0               (em2820/em2840)
+ 31 -> Usbgear VD204v9                          (em2821)
+ 32 -> Supercomp USB 2.0 TV                     (em2821)
+ 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0  (em2821)
+ 34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]
+ 35 -> Typhoon DVD Maker                        (em2860)
+ 36 -> NetGMBH Cam                              (em2860)
+ 37 -> Gadmei UTV330                            (em2860)
+ 38 -> Yakumo MovieMixer                        (em2861)
+ 39 -> KWorld PVRTV 300U                        (em2861)        [eb1a:e300]
+ 40 -> Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]
+ 41 -> Kworld 350 U DVB-T                       (em2870)        [eb1a:e350]
+ 42 -> Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357]
+ 43 -> Terratec Cinergy T XS                    (em2870)        [0ccd:0043]
+ 44 -> Terratec Cinergy T XS (MT2060)           (em2870)
+ 45 -> Pinnacle PCTV DVB-T                      (em2870)
+ 46 -> Compro, VideoMate U3                     (em2870)        [185b:2870]
+ 47 -> KWorld DVB-T 305U                        (em2880)        [eb1a:e305]
+ 48 -> KWorld DVB-T 310U                        (em2880)        [eb1a:e310]
+ 49 -> MSI DigiVox A/D                          (em2880)        [eb1a:e310]
+ 50 -> MSI DigiVox A/D II                       (em2880)        [eb1a:e320]
+ 51 -> Terratec Hybrid XS Secam                 (em2880)        [0ccd:004c]
+ 52 -> DNT DA2 Hybrid                           (em2881)
+ 53 -> Pinnacle Hybrid Pro                      (em2881)
+ 54 -> Kworld VS-DVB-T 323UR                    (em2882)        [eb1a:e323]
+ 55 -> Terratec Hybrid XS (em2882)              (em2882)        [0ccd:005e]
+ 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]
+ 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]
+ 58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]

diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index 1d6a245c828f..187cc48d0924 100644 --- a/Documentation/video4linux/CARDLIST.em28xx +++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -1,17 +1,59 @@
1	0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]	1	0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
2	1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]	2	1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
3	2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]	3	2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
4	3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]	4	3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
5	4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]	5	4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]
6	5 -> MSI VOX USB 2.0 (em2820/em2840)	6	5 -> MSI VOX USB 2.0 (em2820/em2840)
7	6 -> Terratec Cinergy 200 USB (em2800)	7	6 -> Terratec Cinergy 200 USB (em2800)
8	7 -> Leadtek Winfast USB II (em2800)	8	7 -> Leadtek Winfast USB II (em2800) [0413:6023]
9	8 -> Kworld USB2800 (em2800)	9	8 -> Kworld USB2800 (em2800)
10	9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a]	10	9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a]
11	10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500,2040:6502]	11	10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]
12	11 -> Terratec Hybrid XS (em2880) [0ccd:0042]	12	11 -> Terratec Hybrid XS (em2880) [0ccd:0042]
13	12 -> Kworld PVR TV 2800 RF (em2820/em2840)	13	12 -> Kworld PVR TV 2800 RF (em2820/em2840)
14	13 -> Terratec Prodigy XS (em2880) [0ccd:0047]	14	13 -> Terratec Prodigy XS (em2880) [0ccd:0047]
15	14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)	15	14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) [eb1a:2821]
16	15 -> V-Gear PocketTV (em2800)	16	15 -> V-Gear PocketTV (em2800)
17	16 -> Hauppauge WinTV HVR 950 (em2880) [2040:6513,2040:6517,2040:651b,2040:651f]	17	16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b,2040:651f]
		18	17 -> Pinnacle PCTV HD Pro Stick (em2880) [2304:0227]
		19	18 -> Hauppauge WinTV HVR 900 (R2) (em2880) [2040:6502]
		20	19 -> PointNix Intra-Oral Camera (em2860)
		21	20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002]
		22	21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801]
		23	22 -> Unknown EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751]
		24	23 -> Huaqi DLCW-130 (em2750)
		25	24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112]
		26	25 -> Gadmei UTV310 (em2820/em2840)
		27	26 -> Hercules Smart TV USB 2.0 (em2820/em2840)
		28	27 -> Pinnacle PCTV USB 2 (Philips FM1216ME) (em2820/em2840)
		29	28 -> Leadtek Winfast USB II Deluxe (em2820/em2840)
		30	29 -> Pinnacle Dazzle DVC 100 (em2820/em2840)
		31	30 -> Videology 20K14XUSB USB2.0 (em2820/em2840)
		32	31 -> Usbgear VD204v9 (em2821)
		33	32 -> Supercomp USB 2.0 TV (em2821)
		34	33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0 (em2821)
		35	34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f]
		36	35 -> Typhoon DVD Maker (em2860)
		37	36 -> NetGMBH Cam (em2860)
		38	37 -> Gadmei UTV330 (em2860)
		39	38 -> Yakumo MovieMixer (em2861)
		40	39 -> KWorld PVRTV 300U (em2861) [eb1a:e300]
		41	40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005]
		42	41 -> Kworld 350 U DVB-T (em2870) [eb1a:e350]
		43	42 -> Kworld 355 U DVB-T (em2870) [eb1a:e355,eb1a:e357]
		44	43 -> Terratec Cinergy T XS (em2870) [0ccd:0043]
		45	44 -> Terratec Cinergy T XS (MT2060) (em2870)
		46	45 -> Pinnacle PCTV DVB-T (em2870)
		47	46 -> Compro, VideoMate U3 (em2870) [185b:2870]
		48	47 -> KWorld DVB-T 305U (em2880) [eb1a:e305]
		49	48 -> KWorld DVB-T 310U (em2880) [eb1a:e310]
		50	49 -> MSI DigiVox A/D (em2880) [eb1a:e310]
		51	50 -> MSI DigiVox A/D II (em2880) [eb1a:e320]
		52	51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c]
		53	52 -> DNT DA2 Hybrid (em2881)
		54	53 -> Pinnacle Hybrid Pro (em2881)
		55	54 -> Kworld VS-DVB-T 323UR (em2882) [eb1a:e323]
		56	55 -> Terratec Hybrid XS (em2882) (em2882) [0ccd:005e]
		57	56 -> Pinnacle Hybrid Pro (2) (em2882) [2304:0226]
		58	57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
		59	58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]