diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-17 12:03:13 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-17 12:03:13 +0100 |
| commit | 9286a1248e4670748e395347f884e4b363e60bb9 (patch) | |
| tree | c6e59ba6f588d8a35cc7cdcdbb4493cd5e4af389 /linux/drivers/media/video/sn9c102 | |
| parent | 50766f4c30d4894525df9b6abbb0c6899a7718ee (diff) | |
| parent | e5aac8238a72bb1bd1b7297e5fcd2bd98aabb745 (diff) | |
| download | mediapointer-dvb-s2-9286a1248e4670748e395347f884e4b363e60bb9.tar.gz mediapointer-dvb-s2-9286a1248e4670748e395347f884e4b363e60bb9.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/sn9c102')
| -rw-r--r-- | linux/drivers/media/video/sn9c102/sn9c102_devtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/sn9c102/sn9c102_devtable.h b/linux/drivers/media/video/sn9c102/sn9c102_devtable.h index 390722003..b0d9d9589 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102_devtable.h +++ b/linux/drivers/media/video/sn9c102/sn9c102_devtable.h @@ -117,7 +117,9 @@ static const struct usb_device_id sn9c102_id_table[] = { { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), }, { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), }, /* { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */ +#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), }, +#endif { SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), }, { SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), }, { SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), }, |