aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c18
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 15 insertions, 5 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 684146f98eb7..ad80b939a40f 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1929,14 +1929,18 @@ struct usb_device_id dib0700_usb_id_table[] = {
1929 { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D) }, 1929 { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D) },
1930/* 55 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D_2) }, 1930/* 55 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_STK7700D_2) },
1931 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73A) }, 1931 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73A) },
1932 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) }, 1932 { USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV73ESE) },
1933 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) }, 1933 { USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV282E) },
1934 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7770P) }, 1934 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7770P) },
1935/* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) }, 1935/* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) },
1936 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XPVR) }, 1936 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XPVR) },
1937 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) }, 1937 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) },
1938 { USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) }, 1938 { USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
1939 { USB_DEVICE(USB_VID_EVOLUTEPC, USB_PID_TVWAY_PLUS) }, 1939 { USB_DEVICE(USB_VID_EVOLUTEPC, USB_PID_TVWAY_PLUS) },
1940/* 65 */{ USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV74E) },
1941 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) },
1942 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) },
1943 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV74E) },
1940 { 0 } /* Terminating entry */ 1944 { 0 } /* Terminating entry */
1941}; 1945};
1942MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1946MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -2231,18 +2235,22 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2231 }, 2235 },
2232 }, 2236 },
2233 2237
2234 .num_device_descs = 3, 2238 .num_device_descs = 4,
2235 .devices = { 2239 .devices = {
2236 { "Pinnacle PCTV 73A", 2240 { "Pinnacle PCTV 73A",
2237 { &dib0700_usb_id_table[56], NULL }, 2241 { &dib0700_usb_id_table[56], NULL },
2238 { NULL }, 2242 { NULL },
2239 }, 2243 },
2240 { "Pinnacle PCTV 73e SE", 2244 { "Pinnacle PCTV 73e SE",
2241 { &dib0700_usb_id_table[57], NULL }, 2245 { &dib0700_usb_id_table[57], &dib0700_usb_id_table[66], NULL },
2242 { NULL }, 2246 { NULL },
2243 }, 2247 },
2244 { "Pinnacle PCTV 282e", 2248 { "Pinnacle PCTV 282e",
2245 { &dib0700_usb_id_table[58], NULL }, 2249 { &dib0700_usb_id_table[58], &dib0700_usb_id_table[67], NULL },
2250 { NULL },
2251 },
2252 { "Pinnacle PCTV 74e",
2253 { &dib0700_usb_id_table[65], &dib0700_usb_id_table[68], NULL },
2246 { NULL }, 2254 { NULL },
2247 }, 2255 },
2248 }, 2256 },
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index f1602d4ace6d..cf7f2b4b75ea 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -47,6 +47,7 @@
47#define USB_VID_MSI_2 0x1462 47#define USB_VID_MSI_2 0x1462
48#define USB_VID_OPERA1 0x695c 48#define USB_VID_OPERA1 0x695c
49#define USB_VID_PINNACLE 0x2304 49#define USB_VID_PINNACLE 0x2304
50#define USB_VID_PCTV 0x2013
50#define USB_VID_PIXELVIEW 0x1554 51#define USB_VID_PIXELVIEW 0x1554
51#define USB_VID_TECHNOTREND 0x0b48 52#define USB_VID_TECHNOTREND 0x0b48
52#define USB_VID_TERRATEC 0x0ccd 53#define USB_VID_TERRATEC 0x0ccd
@@ -211,6 +212,7 @@
211#define USB_PID_PINNACLE_PCTV801E_SE 0x023b 212#define USB_PID_PINNACLE_PCTV801E_SE 0x023b
212#define USB_PID_PINNACLE_PCTV73A 0x0243 213#define USB_PID_PINNACLE_PCTV73A 0x0243
213#define USB_PID_PINNACLE_PCTV73ESE 0x0245 214#define USB_PID_PINNACLE_PCTV73ESE 0x0245
215#define USB_PID_PINNACLE_PCTV74E 0x0246
214#define USB_PID_PINNACLE_PCTV282E 0x0248 216#define USB_PID_PINNACLE_PCTV282E 0x0248
215#define USB_PID_PIXELVIEW_SBTVD 0x5010 217#define USB_PID_PIXELVIEW_SBTVD 0x5010
216#define USB_PID_PCTV_200E 0x020e 218#define USB_PID_PCTV_200E 0x020e