aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c8
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 228aa4237334..18d169836c9c 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -451,6 +451,8 @@ static struct usb_device_id cxusb_table [] = {
451 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) }, 451 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) },
452 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) }, 452 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) },
453 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) }, 453 { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) },
454 { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD) },
455 { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM) },
454 {} /* Terminating entry */ 456 {} /* Terminating entry */
455}; 457};
456MODULE_DEVICE_TABLE (usb, cxusb_table); 458MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -567,12 +569,16 @@ static struct dvb_usb_properties cxusb_bluebird_dee1601_properties = {
567 } 569 }
568 }, 570 },
569 571
570 .num_device_descs = 1, 572 .num_device_descs = 2,
571 .devices = { 573 .devices = {
572 { "DViCO FusionHDTV DVB-T Dual USB", 574 { "DViCO FusionHDTV DVB-T Dual USB",
573 { &cxusb_table[3], NULL }, 575 { &cxusb_table[3], NULL },
574 { &cxusb_table[4], NULL }, 576 { &cxusb_table[4], NULL },
575 }, 577 },
578 { "DigitalNow DVB-T Dual USB",
579 { &cxusb_table[9], NULL },
580 { &cxusb_table[10], NULL },
581 },
576 } 582 }
577}; 583};
578 584
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index d22934383226..4a1b9e77e339 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -95,6 +95,8 @@
95#define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11 95#define USB_PID_DVICO_BLUEBIRD_TH7579_WARM 0xdb11
96#define USB_PID_DVICO_BLUEBIRD_DEE1601_COLD 0xdb50 96#define USB_PID_DVICO_BLUEBIRD_DEE1601_COLD 0xdb50
97#define USB_PID_DVICO_BLUEBIRD_DEE1601_WARM 0xdb51 97#define USB_PID_DVICO_BLUEBIRD_DEE1601_WARM 0xdb51
98#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD 0xdb54
99#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM 0xdb55
98#define USB_PID_MEDION_MD95700 0x0932 100#define USB_PID_MEDION_MD95700 0x0932
99#define USB_PID_KYE_DVB_T_COLD 0x701e 101#define USB_PID_KYE_DVB_T_COLD 0x701e
100#define USB_PID_KYE_DVB_T_WARM 0x701f 102#define USB_PID_KYE_DVB_T_WARM 0x701f