aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index da177e745e5e..58ecc8ff858a 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -114,6 +114,7 @@ static int stk7700p_tuner_attach(struct dvb_usb_adapter *adap)
114struct usb_device_id dib0700_usb_id_table[] = { 114struct usb_device_id dib0700_usb_id_table[] = {
115 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) }, 115 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) },
116 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) }, 116 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) },
117 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) },
117 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) }, 118 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) },
118 { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) }, 119 { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) },
119 { } /* Terminating entry */ 120 { } /* Terminating entry */
@@ -164,11 +165,11 @@ struct dvb_usb_device_properties dib0700_devices[] = {
164 { NULL }, 165 { NULL },
165 }, 166 },
166 { "Hauppauge Nova-T Stick", 167 { "Hauppauge Nova-T Stick",
167 { &dib0700_usb_id_table[2], NULL }, 168 { &dib0700_usb_id_table[3], NULL },
168 { NULL }, 169 { NULL },
169 }, 170 },
170 { "AVerMedia AVerTV DVB-T Volar", 171 { "AVerMedia AVerTV DVB-T Volar",
171 { &dib0700_usb_id_table[3], NULL }, 172 { &dib0700_usb_id_table[4], NULL },
172 { NULL }, 173 { NULL },
173 }, 174 },
174 } 175 }
@@ -192,7 +193,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
192 .num_device_descs = 1, 193 .num_device_descs = 1,
193 .devices = { 194 .devices = {
194 { "Hauppauge Nova-T 500 Dual DVB-T", 195 { "Hauppauge Nova-T 500 Dual DVB-T",
195 { &dib0700_usb_id_table[1], NULL }, 196 { &dib0700_usb_id_table[1], &dib0700_usb_id_table[2], NULL },
196 { NULL }, 197 { NULL },
197 }, 198 },
198 } 199 }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 415a9892391d..35bd92803730 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -95,6 +95,7 @@
95#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300 95#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300
96#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301 96#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301
97#define USB_PID_HAUPPAUGE_NOVA_T_500 0x9941 97#define USB_PID_HAUPPAUGE_NOVA_T_500 0x9941
98#define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950
98#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 99#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050
99#define USB_PID_AVERMEDIA_VOLAR 0x1234 100#define USB_PID_AVERMEDIA_VOLAR 0x1234
100#define USB_PID_NEBULA_DIGITV 0x0201 101#define USB_PID_NEBULA_DIGITV 0x0201