From: Yuxi Sun Date: Sat, 8 Oct 2011 04:46:17 +0000 (+0800) Subject: ENGR00159008-2 mx6 v4l2: build v4l2 relative modules as module mode X-Git-Tag: v3.0.35-fsl~2062 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=603585228ee32d5162ac72fa683a82da740c4f30;p=karo-tx-linux.git ENGR00159008-2 mx6 v4l2: build v4l2 relative modules as module mode Change v4l2 relative modules as module mode when build kernel Signed-off-by: Yuxi Sun --- diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 49f92189e6fa..18d4baa72dcb 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Fri Sep 23 10:51:09 2011 +# Sat Oct 8 10:55:25 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1307,7 +1307,21 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_MXC_CAMERA is not set +CONFIG_VIDEO_MXC_CAMERA=m + +# +# MXC Camera/V4L2 PRP Features support +# +CONFIG_VIDEO_MXC_IPU_CAMERA=y +# CONFIG_VIDEO_MXC_CSI_CAMERA is not set +# CONFIG_MXC_CAMERA_MICRON111 is not set +# CONFIG_MXC_CAMERA_OV2640 is not set +CONFIG_MXC_CAMERA_OV3640=m +CONFIG_MXC_CAMERA_OV5640=m +CONFIG_MXC_CAMERA_OV5642=m +CONFIG_MXC_IPU_PRP_VF_SDC=m +CONFIG_MXC_IPU_PRP_ENC=m +CONFIG_MXC_IPU_CSI_ENC=m CONFIG_VIDEO_MXC_OUTPUT=y CONFIG_VIDEO_MXC_IPU_OUTPUT=y # CONFIG_VIDEO_MXC_IPUV1_WVGA_OUTPUT is not set