diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-07 08:31:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:17:59 -0300 |
| commit | c41492c89a00630c7482eae25deaf9af91b73c98 (patch) | |
| tree | 9b42d5644b7ec6d5e1c48f264aab4ead5c4659af /drivers/media/video/gspca/etoms.c | |
| parent | f87086e302300fdff1bd32049deb7a7f3e3de7da (diff) | |
| download | kernel_samsung_smdk4412-c41492c89a00630c7482eae25deaf9af91b73c98.zip kernel_samsung_smdk4412-c41492c89a00630c7482eae25deaf9af91b73c98.tar.gz kernel_samsung_smdk4412-c41492c89a00630c7482eae25deaf9af91b73c98.tar.bz2 | |
V4L/DVB (8231): gspca: Do not declare the webcams declared by other drivers.
etoms: Do not declare the webcams declared by the driver et61x251.
sonixb, sonixj:
Do not declare the webcams declared by the driver sn9c102.
zc3xx: Do not declare the webcams declared by the driver zc0301.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/etoms.c')
| -rw-r--r-- | drivers/media/video/gspca/etoms.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c index 4db3361..1da6a18 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/video/gspca/etoms.c @@ -912,7 +912,9 @@ static struct sd_desc sd_desc = { /* -- module initialisation -- */ #define DVNM(name) .driver_info = (kernel_ulong_t) name static __devinitdata struct usb_device_id device_table[] = { +#ifndef CONFIG_USB_ET61X251 {USB_DEVICE(0x102c, 0x6151), DVNM("Qcam Sangha CIF")}, +#endif {USB_DEVICE(0x102c, 0x6251), DVNM("Qcam xxxxxx VGA")}, {} }; |