diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dib0700_devices.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index c231a1e5204e..fe305f4430ea 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -269,11 +269,13 @@ static int stk7700p_tuner_attach(struct dvb_usb_adapter *adap) | |||
269 | 269 | ||
270 | struct usb_device_id dib0700_usb_id_table[] = { | 270 | struct usb_device_id dib0700_usb_id_table[] = { |
271 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) }, | 271 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) }, |
272 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P_PC) }, | ||
273 | |||
272 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) }, | 274 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) }, |
273 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) }, | 275 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) }, |
274 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) }, | 276 | { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) }, |
275 | { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) }, | 277 | { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) }, |
276 | { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P_PC) }, | 278 | { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500) }, |
277 | { } /* Terminating entry */ | 279 | { } /* Terminating entry */ |
278 | }; | 280 | }; |
279 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | 281 | MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); |
@@ -315,20 +317,24 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
315 | }, | 317 | }, |
316 | }, | 318 | }, |
317 | 319 | ||
318 | .num_device_descs = 3, | 320 | .num_device_descs = 4, |
319 | .devices = { | 321 | .devices = { |
320 | { "DiBcom STK7700P reference design", | 322 | { "DiBcom STK7700P reference design", |
321 | { &dib0700_usb_id_table[0], &dib0700_usb_id_table[5] }, | 323 | { &dib0700_usb_id_table[0], &dib0700_usb_id_table[1] }, |
322 | { NULL }, | 324 | { NULL }, |
323 | }, | 325 | }, |
324 | { "Hauppauge Nova-T Stick", | 326 | { "Hauppauge Nova-T Stick", |
325 | { &dib0700_usb_id_table[3], NULL }, | 327 | { &dib0700_usb_id_table[4], NULL }, |
326 | { NULL }, | 328 | { NULL }, |
327 | }, | 329 | }, |
328 | { "AVerMedia AVerTV DVB-T Volar", | 330 | { "AVerMedia AVerTV DVB-T Volar", |
329 | { &dib0700_usb_id_table[4], NULL }, | 331 | { &dib0700_usb_id_table[5], NULL }, |
330 | { NULL }, | 332 | { NULL }, |
331 | }, | 333 | }, |
334 | { "Compro Videomate U500", | ||
335 | { &dib0700_usb_id_table[6], NULL }, | ||
336 | { NULL }, | ||
337 | } | ||
332 | } | 338 | } |
333 | }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, | 339 | }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, |
334 | 340 | ||
@@ -350,7 +356,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { | |||
350 | .num_device_descs = 1, | 356 | .num_device_descs = 1, |
351 | .devices = { | 357 | .devices = { |
352 | { "Hauppauge Nova-T 500 Dual DVB-T", | 358 | { "Hauppauge Nova-T 500 Dual DVB-T", |
353 | { &dib0700_usb_id_table[1], &dib0700_usb_id_table[2], NULL }, | 359 | { &dib0700_usb_id_table[2], &dib0700_usb_id_table[3], NULL }, |
354 | { NULL }, | 360 | { NULL }, |
355 | }, | 361 | }, |
356 | } | 362 | } |