aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/etoms.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-07 07:31:16 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:17:59 -0400
commitc41492c89a00630c7482eae25deaf9af91b73c98 (patch)
tree9b42d5644b7ec6d5e1c48f264aab4ead5c4659af /drivers/media/video/gspca/etoms.c
parentf87086e302300fdff1bd32049deb7a7f3e3de7da (diff)
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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 4db33618af6b..1da6a182561f 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 = {
912/* -- module initialisation -- */ 912/* -- module initialisation -- */
913#define DVNM(name) .driver_info = (kernel_ulong_t) name 913#define DVNM(name) .driver_info = (kernel_ulong_t) name
914static __devinitdata struct usb_device_id device_table[] = { 914static __devinitdata struct usb_device_id device_table[] = {
915#ifndef CONFIG_USB_ET61X251
915 {USB_DEVICE(0x102c, 0x6151), DVNM("Qcam Sangha CIF")}, 916 {USB_DEVICE(0x102c, 0x6151), DVNM("Qcam Sangha CIF")},
917#endif
916 {USB_DEVICE(0x102c, 0x6251), DVNM("Qcam xxxxxx VGA")}, 918 {USB_DEVICE(0x102c, 0x6251), DVNM("Qcam xxxxxx VGA")},
917 {} 919 {}
918}; 920};