diff options
| author | Jean-François Moine <moinejf@free.fr> | 2010-03-29 02:51:18 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:52:49 -0400 |
| commit | dbad345e6a6159e5d8aec45533d299aa2a138aff (patch) | |
| tree | 96c6145198343b3ce1ce4fec7376b91ecf314a5b /drivers/media/video/zc0301 | |
| parent | be1da9ee83eb5c27a69b30577232d1ec72876e7a (diff) | |
V4L/DVB: sn9c102 / zc0301: Handle webcams when no gspca subdriver conflict
Some webcams handled by both sn9c102 or zc0301 and some gspca subdrivers
(sonixb, sonixj and zc3xx) were not handled when gspca was generated but
not the associated subdrivers.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zc0301')
| -rw-r--r-- | drivers/media/video/zc0301/zc0301_sensor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h index 3a408de91b9c..0be783c203f7 100644 --- a/drivers/media/video/zc0301/zc0301_sensor.h +++ b/drivers/media/video/zc0301/zc0301_sensor.h | |||
| @@ -58,7 +58,7 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor); | |||
| 58 | .idProduct = (prod), \ | 58 | .idProduct = (prod), \ |
| 59 | .bInterfaceClass = (intclass) | 59 | .bInterfaceClass = (intclass) |
| 60 | 60 | ||
| 61 | #if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE | 61 | #if !defined CONFIG_USB_GSPCA_ZC3XX && !defined CONFIG_USB_GSPCA_ZC3XX_MODULE |
| 62 | #define ZC0301_ID_TABLE \ | 62 | #define ZC0301_ID_TABLE \ |
| 63 | static const struct usb_device_id zc0301_id_table[] = { \ | 63 | static const struct usb_device_id zc0301_id_table[] = { \ |
| 64 | { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ | 64 | { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ |