diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.em28xx | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index ceb277543f51..dbc19ca9e483 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) | 8 | 7 -> Leadtek Winfast USB II (em2800) |
9 | 8 -> Kworld USB2800 (em2800) | 9 | 8 -> Kworld USB2800 (em2800) |
10 | 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207] | 10 | 9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [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 c4204c90fb01..e00de3286055 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -329,7 +329,7 @@ struct em28xx_board em28xx_boards[] = { | |||
329 | } }, | 329 | } }, |
330 | }, | 330 | }, |
331 | [EM2820_BOARD_PINNACLE_DVC_90] = { | 331 | [EM2820_BOARD_PINNACLE_DVC_90] = { |
332 | .name = "Pinnacle Dazzle DVC 90", | 332 | .name = "Pinnacle Dazzle DVC 90/DVC 100", |
333 | .vchannels = 3, | 333 | .vchannels = 3, |
334 | .has_tuner = 0, | 334 | .has_tuner = 0, |
335 | .decoder = EM28XX_SAA7113, | 335 | .decoder = EM28XX_SAA7113, |
@@ -416,6 +416,8 @@ struct usb_device_id em28xx_id_table [] = { | |||
416 | .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, | 416 | .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, |
417 | { USB_DEVICE(0x2304, 0x0207), | 417 | { USB_DEVICE(0x2304, 0x0207), |
418 | .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, | 418 | .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, |
419 | { USB_DEVICE(0x2304, 0x021a), | ||
420 | .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, | ||
419 | { USB_DEVICE(0x2040, 0x6500), | 421 | { USB_DEVICE(0x2040, 0x6500), |
420 | .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, | 422 | .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, |
421 | { USB_DEVICE(0x2040, 0x6513), | 423 | { USB_DEVICE(0x2040, 0x6513), |