diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 9a6a4541e3c7..05264c655b5e 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -57,22 +57,8 @@ struct em28xx_board em28xx_boards[] = { | |||
57 | }}, | 57 | }}, |
58 | }, | 58 | }, |
59 | [EM2820_BOARD_UNKNOWN] = { | 59 | [EM2820_BOARD_UNKNOWN] = { |
60 | .name = "Unknown EM2820/2840 video grabber", | 60 | .name = "Unknown EM2750/28xx video grabber", |
61 | .is_em2800 = 0, | 61 | .is_em2800 = 0, |
62 | .vchannels = 2, | ||
63 | .norm = VIDEO_MODE_PAL, | ||
64 | .tda9887_conf = TDA9887_PRESENT, | ||
65 | .has_tuner = 1, | ||
66 | .decoder = EM28XX_SAA7113, | ||
67 | .input = {{ | ||
68 | .type = EM28XX_VMUX_COMPOSITE1, | ||
69 | .vmux = SAA7115_COMPOSITE0, | ||
70 | .amux = 1, | ||
71 | },{ | ||
72 | .type = EM28XX_VMUX_SVIDEO, | ||
73 | .vmux = SAA7115_SVIDEO3, | ||
74 | .amux = 1, | ||
75 | }}, | ||
76 | }, | 62 | }, |
77 | [EM2820_BOARD_KWORLD_PVRTV2800RF] = { | 63 | [EM2820_BOARD_KWORLD_PVRTV2800RF] = { |
78 | .name = "Kworld PVR TV 2800 RF", | 64 | .name = "Kworld PVR TV 2800 RF", |
@@ -337,8 +323,15 @@ const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); | |||
337 | 323 | ||
338 | /* table of devices that work with this driver */ | 324 | /* table of devices that work with this driver */ |
339 | struct usb_device_id em28xx_id_table [] = { | 325 | struct usb_device_id em28xx_id_table [] = { |
326 | { USB_DEVICE(0xeb1a, 0x2750), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
340 | { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, | 327 | { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, |
341 | { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 }, | 328 | { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_UNKNOWN }, |
329 | { USB_DEVICE(0xeb1a, 0x2821), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
330 | { USB_DEVICE(0xeb1a, 0x2860), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
331 | { USB_DEVICE(0xeb1a, 0x2861), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
332 | { USB_DEVICE(0xeb1a, 0x2870), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
333 | { USB_DEVICE(0xeb1a, 0x2881), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
334 | { USB_DEVICE(0xeb1a, 0x2883), .driver_info = EM2820_BOARD_UNKNOWN }, | ||
342 | { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, | 335 | { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, |
343 | { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, | 336 | { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, |
344 | { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, | 337 | { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, |