aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-06-26 21:59:33 +0800
committerAndy Green <andy.green@linaro.org>2012-06-26 21:59:33 +0800
commit86a35818a88922d7d96a7613c3da5e1157a4061f (patch)
treed4b863903363f356c0d74f3ba0605b50b46c7d3d
parenta048428d686f0f52b43b291b5abdfe3ea42732c8 (diff)
config additional v4l2 configstracking-tilt-3.4-llt-20120626.0
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/omap4plus_defconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/configs/omap4plus_defconfig b/arch/arm/configs/omap4plus_defconfig
index be9eb0079e80..c58276791898 100644
--- a/arch/arm/configs/omap4plus_defconfig
+++ b/arch/arm/configs/omap4plus_defconfig
@@ -131,6 +131,20 @@ CONFIG_MFD_PALMAS_RESOURCE=y
CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_PALMAS=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_RC_CORE is not set
+CONFIG_MEDIA_ATTACH=y
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+# CONFIG_RADIO_ADAPTERS is not set
CONFIG_DRM=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y