From edde91472f7b6a4ef4f8ea24f52a451b0650ccc4 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Fri, 8 Aug 2008 09:35:25 +0200 Subject: gspca: Conflict GSPCA / ET61X251 for the webcam 102c:6251. From: Jean-Francois Moine Fix a double handling of 102c:6251 and no handling of 102c:6151 when both drivers GSPCA and ET61X251. Priority: normal Signed-off-by: Jean-Francois Moine --- linux/drivers/media/video/gspca/etoms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/drivers/media/video/gspca/etoms.c b/linux/drivers/media/video/gspca/etoms.c index 60b316a37..a9d043606 100644 --- a/linux/drivers/media/video/gspca/etoms.c +++ b/linux/drivers/media/video/gspca/etoms.c @@ -910,10 +910,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 {} }; -- cgit v1.2.3