aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPatrick Boettcher <pboettcher@kernellabs.com>2009-12-01 10:08:56 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-15 21:18:15 -0500
commit20232c4791507189d4e9499f81632a1ce434f2a4 (patch)
tree9cb2f8c75f203e45031c192c40b6d46d78946122 /drivers
parente414753c8ce5fb0bd81155406efaefe57f374571 (diff)
V4L/DVB (13582): DiB0700: remove USB IDs of PCTV 74e from the driver
The PCTV 74e is not a design based on the dib0700-USB-device controller thus we should not have its USB IDs inside. This reverts partly: Add support for PCTV 74e (Pinnacle) + fix USB vendor IDs Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index ad80b939a40f..923fa157aa51 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1937,10 +1937,8 @@ struct usb_device_id dib0700_usb_id_table[] = {
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) }, 1940/* 65 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) },
1941 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) },
1942 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) }, 1941 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) },
1943 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV74E) },
1944 { 0 } /* Terminating entry */ 1942 { 0 } /* Terminating entry */
1945}; 1943};
1946MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1944MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -2235,22 +2233,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2235 }, 2233 },
2236 }, 2234 },
2237 2235
2238 .num_device_descs = 4, 2236 .num_device_descs = 3,
2239 .devices = { 2237 .devices = {
2240 { "Pinnacle PCTV 73A", 2238 { "Pinnacle PCTV 73A",
2241 { &dib0700_usb_id_table[56], NULL }, 2239 { &dib0700_usb_id_table[56], NULL },
2242 { NULL }, 2240 { NULL },
2243 }, 2241 },
2244 { "Pinnacle PCTV 73e SE", 2242 { "Pinnacle PCTV 73e SE",
2245 { &dib0700_usb_id_table[57], &dib0700_usb_id_table[66], NULL }, 2243 { &dib0700_usb_id_table[57], &dib0700_usb_id_table[65], NULL },
2246 { NULL }, 2244 { NULL },
2247 }, 2245 },
2248 { "Pinnacle PCTV 282e", 2246 { "Pinnacle PCTV 282e",
2249 { &dib0700_usb_id_table[58], &dib0700_usb_id_table[67], NULL }, 2247 { &dib0700_usb_id_table[58], &dib0700_usb_id_table[66], NULL },
2250 { NULL },
2251 },
2252 { "Pinnacle PCTV 74e",
2253 { &dib0700_usb_id_table[65], &dib0700_usb_id_table[68], NULL },
2254 { NULL }, 2248 { NULL },
2255 }, 2249 },
2256 }, 2250 },