diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
| commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
| tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /include | |
| parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
| parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/v4l2-chip-ident.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index fb929eacd2e6..a0d15e57cc6f 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -78,6 +78,7 @@ enum { V4L2_IDENT_OV9740 = 260, V4L2_IDENT_OV5642 = 261, V4L2_IDENT_OV5640 = 262, + V4L2_IDENT_OV5650 = 263, /* module saa7146: reserved range 300-309 */ V4L2_IDENT_SAA7146 = 300, |