aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx2
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index b37eff3c9888..b13fcbd5d94b 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/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,2304:0207,2304:021a] 10 9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,1b80:e304,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 ec4763f73b26..7e3c78239fa9 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1037,7 +1037,8 @@ struct em28xx_board em28xx_boards[] = {
1037 } }, 1037 } },
1038 }, 1038 },
1039 [EM2820_BOARD_PINNACLE_DVC_90] = { 1039 [EM2820_BOARD_PINNACLE_DVC_90] = {
1040 .name = "Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker", 1040 .name = "Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker "
1041 "/ Kworld DVD Maker 2",
1041 .tuner_type = TUNER_ABSENT, /* capture only board */ 1042 .tuner_type = TUNER_ABSENT, /* capture only board */
1042 .decoder = EM28XX_SAA711X, 1043 .decoder = EM28XX_SAA711X,
1043 .input = { { 1044 .input = { {
@@ -1618,6 +1619,8 @@ struct usb_device_id em28xx_id_table[] = {
1618 .driver_info = EM2870_BOARD_KWORLD_355U }, 1619 .driver_info = EM2870_BOARD_KWORLD_355U },
1619 { USB_DEVICE(0x1b80, 0xe302), 1620 { USB_DEVICE(0x1b80, 0xe302),
1620 .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, /* Kaiser Baas Video to DVD maker */ 1621 .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, /* Kaiser Baas Video to DVD maker */
1622 { USB_DEVICE(0x1b80, 0xe304),
1623 .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, /* Kworld DVD Maker 2 */
1621 { USB_DEVICE(0x0ccd, 0x0036), 1624 { USB_DEVICE(0x0ccd, 0x0036),
1622 .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, 1625 .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
1623 { USB_DEVICE(0x0ccd, 0x004c), 1626 { USB_DEVICE(0x0ccd, 0x004c),