diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-08 09:35:25 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-08 09:35:25 +0200 |
| commit | edde91472f7b6a4ef4f8ea24f52a451b0650ccc4 (patch) | |
| tree | 3cbf75e5606e188443735ff623648a22d3566af8 /linux/drivers/media/video/gspca/etoms.c | |
| parent | 84139cb9cd6b39f5bad49011990738d7a985e249 (diff) | |
| download | mediapointer-dvb-s2-edde91472f7b6a4ef4f8ea24f52a451b0650ccc4.tar.gz mediapointer-dvb-s2-edde91472f7b6a4ef4f8ea24f52a451b0650ccc4.tar.bz2 | |
gspca: Conflict GSPCA / ET61X251 for the webcam 102c:6251.
From: Jean-Francois Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/gspca/etoms.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/etoms.c | 4 |
1 files 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 {} }; |