From 72802711fb679622cbdb0a2754054b59ea49b349 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Tue, 29 Jan 2013 13:49:12 -0200
Subject: [PATCH] --- yaml --- r: 355720 b: refs/heads/master c:
 09de7ee1695f182886360faf9cf66702b5342199 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/configs/imx_v4_v5_defconfig | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 44695f6686e4..5bcc3c0aed22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34d725e566b6a4ea961c18184905e7258bb4c323
+refs/heads/master: 09de7ee1695f182886360faf9cf66702b5342199
diff --git a/trunk/arch/arm/configs/imx_v4_v5_defconfig b/trunk/arch/arm/configs/imx_v4_v5_defconfig
index 516d03f1672b..02c657af4005 100644
--- a/trunk/arch/arm/configs/imx_v4_v5_defconfig
+++ b/trunk/arch/arm/configs/imx_v4_v5_defconfig
@@ -128,6 +128,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_VIDEO_MX2=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
 CONFIG_FB=y
 CONFIG_FB_IMX=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y