diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-09-03 16:47:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 18:36:33 -0300 |
| commit | 5bb0f21a46281b021897d2c56d50685c1939b5ee (patch) | |
| tree | 8b6622e4ea574be6fa1c0efc77978638e80b8103 /drivers | |
| parent | 3466234229e6535a061f5f63a87bfb12c833d96a (diff) | |
| download | blackbird-op-linux-5bb0f21a46281b021897d2c56d50685c1939b5ee.tar.gz blackbird-op-linux-5bb0f21a46281b021897d2c56d50685c1939b5ee.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/gspca/etoms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c index 1dbe92d01e6a..ca23c3f9aaa2 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/video/gspca/etoms.c @@ -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 {} }; |
