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 /drivers/media/video/Kconfig | |
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 'drivers/media/video/Kconfig')
-rw-r--r-- | drivers/media/video/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index d092e31dfaa4..0fe628f5912d 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -872,6 +872,12 @@ config SOC_CAMERA_OV5642 help This is a V4L2 camera driver for the OmniVision OV5642 sensor +config SOC_CAMERA_OV5650 + tristate "ov5650 sensor support" + depends on SOC_CAMERA && I2C + help + This is a V4L2 camera driver for the OmniVision OV5650 sensor + config SOC_CAMERA_OV6650 tristate "ov6650 sensor support" depends on SOC_CAMERA && I2C |