V4L/DVB (8668): gspca: Conflict GSPCA / ET61X251 for the webcam 102c:6251.
Fix a double handling of 102c:6251 and no handling of 102c:6151 when both drivers GSPCA and ET61X251. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
3466234229
commit
5bb0f21a46
@ -904,10 +904,10 @@ static struct sd_desc sd_desc = {
|
||||
|
||||
/* -- module initialisation -- */
|
||||
static __devinitdata struct usb_device_id device_table[] = {
|
||||
#ifndef CONFIG_USB_ET61X251
|
||||
{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
|
||||
#endif
|
||||
#ifndef CONFIG_USB_ET61X251
|
||||
{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
|
||||
#endif
|
||||
{}
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user