summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWallace Wang <r59996@freescale.com>2009-12-05 22:35:04 +0800
committerWallace Wang <r59996@freescale.com>2009-12-05 22:35:04 +0800
commita88b8821fd8bbb28c408a624ebd66a557633ba15 (patch)
tree8f3fc770bc3281b093127ecb1a01c47e492ad325
parent4e987d95d9b48e7cda7f3b7648be3e6d428bb07c (diff)
ENGR00119006 MX35: Configure TVIN as modulerel_imx_2.6.31_09.12.00_RC1
TVIN module is missed in MX35 configure file. Signed-off-by: Wallace Wang <r59996@freescale.com>
-rw-r--r--arch/arm/configs/imx35_3stack_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/imx35_3stack_defconfig b/arch/arm/configs/imx35_3stack_defconfig
index a9c2e044ce16..308c94789192 100644
--- a/arch/arm/configs/imx35_3stack_defconfig
+++ b/arch/arm/configs/imx35_3stack_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31
-# Thu Oct 29 17:06:56 2009
+# Sat Dec 5 22:30:18 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -519,6 +519,7 @@ CONFIG_MTD_MXC=y
# Self-contained MTD device drivers
#
# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MXC_DATAFLASH is not set
# CONFIG_MTD_M25P80 is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
@@ -1080,7 +1081,7 @@ CONFIG_VIDEO_MXC_IPU_CAMERA=y
# CONFIG_MXC_CAMERA_MICRON111 is not set
CONFIG_MXC_CAMERA_OV2640=m
# CONFIG_MXC_CAMERA_OV3640 is not set
-# CONFIG_MXC_TVIN_ADV7180 is not set
+CONFIG_MXC_TVIN_ADV7180=m
CONFIG_MXC_IPU_PRP_VF_SDC=m
CONFIG_MXC_IPU_PRP_ENC=m
CONFIG_MXC_IPU_CSI_ENC=m