aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 00665d6ffc17..666630572f35 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -154,6 +154,7 @@ struct em28xx_board em28xx_boards[] = {
154 .amux = 1, 154 .amux = 1,
155 }}, 155 }},
156 }, 156 },
157#ifdef CONFIG_XC3028
157 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { 158 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
158 .name = "Hauppauge WinTV HVR 900", 159 .name = "Hauppauge WinTV HVR 900",
159 .vchannels = 3, 160 .vchannels = 3,
@@ -222,6 +223,7 @@ struct em28xx_board em28xx_boards[] = {
222 .amux = 1, 223 .amux = 1,
223 }}, 224 }},
224 }, 225 },
226#endif
225 [EM2820_BOARD_MSI_VOX_USB_2] = { 227 [EM2820_BOARD_MSI_VOX_USB_2] = {
226 .name = "MSI VOX USB 2.0", 228 .name = "MSI VOX USB 2.0",
227 .vchannels = 3, 229 .vchannels = 3,
@@ -340,9 +342,11 @@ struct usb_device_id em28xx_id_table [] = {
340 { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, 342 { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
341 { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, 343 { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
342 { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, 344 { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
345#ifdef CONFIG_XC3028
343 { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, 346 { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
344 { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, 347 { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
345 { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, 348 { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
349#endif
346 { }, 350 { },
347}; 351};
348 352