summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorPatrick Boettcher <pboettcher@kernellabs.com>2009-12-01 12:08:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 00:18:15 -0200
commit20232c4791507189d4e9499f81632a1ce434f2a4 (patch)
tree9cb2f8c75f203e45031c192c40b6d46d78946122 /drivers/media/dvb/dvb-usb
parente414753c8ce5fb0bd81155406efaefe57f374571 (diff)
downloadlinux-next-20232c4791507189d4e9499f81632a1ce434f2a4.tar.gz
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/media/dvb/dvb-usb')
-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[] = {
{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) },
{ USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
{ USB_DEVICE(USB_VID_EVOLUTEPC, USB_PID_TVWAY_PLUS) },
-/* 65 */{ USB_DEVICE(USB_VID_PCTV, USB_PID_PINNACLE_PCTV74E) },
- { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) },
+/* 65 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73ESE) },
{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV282E) },
- { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV74E) },
{ 0 } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -2235,22 +2233,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
},
},
- .num_device_descs = 4,
+ .num_device_descs = 3,
.devices = {
{ "Pinnacle PCTV 73A",
{ &dib0700_usb_id_table[56], NULL },
{ NULL },
},
{ "Pinnacle PCTV 73e SE",
- { &dib0700_usb_id_table[57], &dib0700_usb_id_table[66], NULL },
+ { &dib0700_usb_id_table[57], &dib0700_usb_id_table[65], NULL },
{ NULL },
},
{ "Pinnacle PCTV 282e",
- { &dib0700_usb_id_table[58], &dib0700_usb_id_table[67], NULL },
- { NULL },
- },
- { "Pinnacle PCTV 74e",
- { &dib0700_usb_id_table[65], &dib0700_usb_id_table[68], NULL },
+ { &dib0700_usb_id_table[58], &dib0700_usb_id_table[66], NULL },
{ NULL },
},
},