From: Jason Chen <b02280@freescale.com>
Date: Tue, 19 Jul 2011 04:54:57 +0000 (+0800)
Subject: ENGR00153270 imx5_defconfig: disable mxc v4l2 capture
X-Git-Tag: v3.0.35-fsl_4.1.0~2399
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bfaacca8123e8f0323f31b74d6c0abecf0bf6e76;p=karo-tx-linux.git

ENGR00153270 imx5_defconfig: disable mxc v4l2 capture

disable config of mxc v4l2 capture to fix build error issue.

Signed-off-by: Jason Chen <b02280@freescale.com>
---

diff --git a/arch/arm/configs/imx5_defconfig b/arch/arm/configs/imx5_defconfig
index 794223bee1f3..6264dd2e553f 100755
--- a/arch/arm/configs/imx5_defconfig
+++ b/arch/arm/configs/imx5_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38 Kernel Configuration
-# Tue May 17 09:57:25 2011
+# Tue Jul 19 12:51:19 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -270,7 +270,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_IPUV3=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_TVE=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_VPU=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_DVFS=y
-CONFIG_IMX_HAVE_PLATFORM_SATA_AHCI=y
+CONFIG_IMX_HAVE_PLATFORM_AHCI=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_IIM=y
 CONFIG_IMX_HAVE_PLATFORM_MXC_GPU=y
 CONFIG_IMX_HAVE_PLATFORM_IMX_OCOTP=y
@@ -291,6 +291,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_SPDIF=y
 # CONFIG_ARCH_MX3 is not set
 # CONFIG_ARCH_MXC91231 is not set
 CONFIG_ARCH_MX5=y
+# CONFIG_ARCH_MX6 is not set
 CONFIG_ARCH_MX50=y
 CONFIG_ARCH_MX51=y
 CONFIG_ARCH_MX53=y
@@ -1402,21 +1403,12 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
 # CONFIG_VIDEO_VIVI 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_VIDEO_MXC_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_MXC_CAMERA_OV3640 is not set
+# CONFIG_MXC_CAMERA_OV5640 is not set
+# CONFIG_MXC_CAMERA_OV5642 is not set
 CONFIG_VIDEO_MXC_OUTPUT=y
 CONFIG_VIDEO_MXC_IPU_OUTPUT=y
 # CONFIG_VIDEO_MXC_IPUV1_WVGA_OUTPUT is not set
@@ -1614,11 +1606,12 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_MXC_SOC_MX2=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_MXC_SOC_SPDIF_DAI=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_MXC_SPDIF=y
 CONFIG_SND_SOC_SGTL5000=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=y
@@ -1977,6 +1970,7 @@ CONFIG_CLKDEV_LOOKUP=y
 #
 CONFIG_MXC_IPU=y
 CONFIG_MXC_IPU_V3=y
+CONFIG_MXC_IPU_V3EX=y
 
 #
 # MXC SSI support
@@ -2037,7 +2031,6 @@ CONFIG_MXC_MC13892_POWER=y
 # MXC VPU(Video Processing Unit) support
 #
 CONFIG_MXC_VPU=y
-# CONFIG_MXC_VPU_IRAM is not set
 # CONFIG_MXC_VPU_DEBUG is not set
 
 #
@@ -2068,6 +2061,10 @@ CONFIG_MXC_VPU=y
 #
 CONFIG_MXC_AMD_GPU=y
 
+#
+# ANATOP_THERMAL
+#
+
 #
 # File systems
 #