diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 12:34:28 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-17 12:34:28 +0200 |
| commit | c6071050792a48dd93a475eeadecdd17064a351c (patch) | |
| tree | bf8b8e301ee8a83ee61cb1a68922718806efefac /linux/drivers/media/video/gspca | |
| parent | 1e67ddc0b6ba075463912399a58477613b9729bf (diff) | |
| download | mediapointer-dvb-s2-c6071050792a48dd93a475eeadecdd17064a351c.tar.gz mediapointer-dvb-s2-c6071050792a48dd93a475eeadecdd17064a351c.tar.bz2 | |
gspca: No conflict of 0c45:6011 with the sn9c102 driver.
From: Hans de Goede <j.w.r.degoede@hhs.nl>
The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is
a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the
ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID
0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102
driver does not support the CISVF10 sensor (not tested).
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/sonixb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/gspca/sonixb.c b/linux/drivers/media/video/gspca/sonixb.c index b4b581e5f..76a0677ed 100644 --- a/linux/drivers/media/video/gspca/sonixb.c +++ b/linux/drivers/media/video/gspca/sonixb.c @@ -1459,7 +1459,9 @@ static __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")}, {USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")}, {USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")}, +#endif {USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")}, +#ifndef CONFIG_USB_SN9C102 {USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")}, {USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")}, {USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")}, |