diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-19 19:34:48 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-19 19:34:48 +0100 |
| commit | e9e48721ed72a07c7d841000bfaeda024af28217 (patch) | |
| tree | ec0f7a24f3b0566e9f659c3cc03ff06f18a1ffb4 | |
| parent | c0d72775f8fc3a3e551f233b3501ccf1ca23fe2a (diff) | |
| download | mediapointer-dvb-s2-e9e48721ed72a07c7d841000bfaeda024af28217.tar.gz mediapointer-dvb-s2-e9e48721ed72a07c7d841000bfaeda024af28217.tar.bz2 | |
gspca - sonixj: Handle the webcam 0c45:613c instead of sn9c102.
From: Jean-Francois Moine <moinejf@free.fr>
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
| -rw-r--r-- | linux/drivers/media/video/gspca/sonixj.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/sn9c102/sn9c102_devtable.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/sonixj.c b/linux/drivers/media/video/gspca/sonixj.c index 5cdb643b8..36d6f50be 100644 --- a/linux/drivers/media/video/gspca/sonixj.c +++ b/linux/drivers/media/video/gspca/sonixj.c @@ -2199,9 +2199,9 @@ static const __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x21)}, #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE {USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)}, +#endif {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)}, /* {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x??)}, */ -#endif {USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, SP80708, 0x18)}, {} }; diff --git a/linux/drivers/media/video/sn9c102/sn9c102_devtable.h b/linux/drivers/media/video/sn9c102/sn9c102_devtable.h index 8cb3457e7..41dfb60f4 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102_devtable.h +++ b/linux/drivers/media/video/sn9c102/sn9c102_devtable.h @@ -123,7 +123,9 @@ static const struct usb_device_id sn9c102_id_table[] = { { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), }, #endif { SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), }, +#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE { SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), }, +#endif { SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), }, { } }; |