diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
| commit | 7c0917f006a519be5e54c6405f54dea61ca06b7a (patch) | |
| tree | 47a8e3218398355b7ba1cdf59b9390afa003fdc9 /linux/drivers/media/video/zc0301 | |
| parent | b1ccf703c9015bc3257716ffccd33ca147f7a1a8 (diff) | |
| parent | 68a6fa1ae421b7c28eb6b8365f3adfd08007e7b7 (diff) | |
| download | mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.gz mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.bz2 | |
commit backport
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zc0301')
| -rw-r--r-- | linux/drivers/media/video/zc0301/zc0301_sensor.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zc0301/zc0301_sensor.h b/linux/drivers/media/video/zc0301/zc0301_sensor.h index 4dc95b5c2..a9cde5419 100644 --- a/linux/drivers/media/video/zc0301/zc0301_sensor.h +++ b/linux/drivers/media/video/zc0301/zc0301_sensor.h @@ -59,12 +59,20 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor); .idProduct = (prod), \ .bInterfaceClass = (intclass) +#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE #define ZC0301_ID_TABLE \ static const struct usb_device_id zc0301_id_table[] = { \ { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ { ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */ \ { } \ }; +#else +#define ZC0301_ID_TABLE \ +static const struct usb_device_id zc0301_id_table[] = { \ + { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \ + { } \ +}; +#endif /*****************************************************************************/ |