diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-01-24 12:02:47 +0100 |
| commit | e30891c22cbad9f8099004481b43588f84905801 (patch) | |
| tree | 857def94eb83cdf5ddc8db414307fe1c313326d9 /linux/drivers/media/video/zc0301/zc0301_sensor.h | |
| parent | 7675a6ebbda69456487f54377309a922b4f415e9 (diff) | |
| parent | 5c23c4c25b7a5368c45f7ee2c0c5dedaf6af346a (diff) | |
| download | mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.gz mediapointer-dvb-s2-e30891c22cbad9f8099004481b43588f84905801.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/zc0301/zc0301_sensor.h')
| -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 /*****************************************************************************/ |