From f55e593f99d75971f31b5980a5f9f3e89732bdcd Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Wed, 1 Aug 2012 12:49:29 -0500 Subject: [PATCH] --- yaml --- r: 326764 b: refs/heads/master c: 56a12b3984a368b1feab41a77f58fe81cc6771bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/imx_v6_v7_defconfig | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c327efa3a793..551f1e953dcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f60c99e22cae4d8761c86967a14e4621322c057e +refs/heads/master: 56a12b3984a368b1feab41a77f58fe81cc6771bf diff --git a/trunk/arch/arm/configs/imx_v6_v7_defconfig b/trunk/arch/arm/configs/imx_v6_v7_defconfig index 3c9f32f9b6b4..400ef342d13e 100644 --- a/trunk/arch/arm/configs/imx_v6_v7_defconfig +++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig @@ -32,8 +32,6 @@ CONFIG_MACH_VPR200=y CONFIG_MACH_IMX51_DT=y CONFIG_MACH_MX51_3DS=y CONFIG_MACH_EUKREA_CPUIMX51SD=y -CONFIG_MACH_MX51_EFIKAMX=y -CONFIG_MACH_MX51_EFIKASB=y CONFIG_MACH_IMX53_DT=y CONFIG_SOC_IMX6Q=y CONFIG_MXC_PWM=y