aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx2
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 5707c6fbf89f..78d0a6eed571 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -7,7 +7,7 @@
7 6 -> Terratec Cinergy 200 USB (em2800) 7 6 -> Terratec Cinergy 200 USB (em2800)
8 7 -> Leadtek Winfast USB II (em2800) [0413:6023] 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/DVC 101/DVC 107 (em2820/em2840) [2304:0207,2304:021a] 10 9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,2304:0207,2304:021a]
11 10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500] 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)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 226dc154aaf0..f7c817765752 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -896,7 +896,7 @@ struct em28xx_board em28xx_boards[] = {
896 } }, 896 } },
897 }, 897 },
898 [EM2820_BOARD_PINNACLE_DVC_90] = { 898 [EM2820_BOARD_PINNACLE_DVC_90] = {
899 .name = "Pinnacle Dazzle DVC 90/DVC 100/DVC 101/DVC 107", 899 .name = "Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker",
900 .tuner_type = TUNER_ABSENT, /* capture only board */ 900 .tuner_type = TUNER_ABSENT, /* capture only board */
901 .decoder = EM28XX_SAA711X, 901 .decoder = EM28XX_SAA711X,
902 .input = { { 902 .input = { {
@@ -1345,6 +1345,8 @@ struct usb_device_id em28xx_id_table[] = {
1345 .driver_info = EM2800_BOARD_GRABBEEX_USB2800 }, 1345 .driver_info = EM2800_BOARD_GRABBEEX_USB2800 },
1346 { USB_DEVICE(0xeb1a, 0xe357), 1346 { USB_DEVICE(0xeb1a, 0xe357),
1347 .driver_info = EM2870_BOARD_KWORLD_355U }, 1347 .driver_info = EM2870_BOARD_KWORLD_355U },
1348 { USB_DEVICE(0x1b80, 0xe302),
1349 .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, /* Kaiser Baas Video to DVD maker */
1348 { USB_DEVICE(0x0ccd, 0x0036), 1350 { USB_DEVICE(0x0ccd, 0x0036),
1349 .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, 1351 .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
1350 { USB_DEVICE(0x0ccd, 0x004c), 1352 { USB_DEVICE(0x0ccd, 0x004c),