summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin Garg <nitin.garg@freescale.com>2015-02-25 12:56:19 -0600
committerNitin Garg <nitin.garg@freescale.com>2015-02-25 14:32:16 -0600
commitda30d9ff558ca14a1d3dbe9a73c474d7c011a91d (patch)
treed29c2d36ef48a7228041dcd820bc566ab4598596
parent15ef4641e7d4f603f07e9536f6c96433d5f42fc0 (diff)
MLK-10259: Remove ARCH_MULTI_V6 config from v7 defconfig
Sync imx_v7_defconfig with imx_3.10. ARCH_MULTI_V6 is not required. Signed-off-by: Nitin Garg <nitin.garg@freescale.com> (cherry picked from commit ea673b70908b301fc9901d804f141974491dcb3d)
-rw-r--r--arch/arm/configs/imx_v7_defconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 4fc0d99781dc..174a3569a3de 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -16,11 +16,8 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MULTI_V6=y
CONFIG_GPIO_PCA953X=y
CONFIG_ARCH_MXC=y
-# CONFIG_MACH_MX31ADS is not set
-# CONFIG_MACH_BUG is not set
CONFIG_MACH_IMX51_DT=y
CONFIG_MACH_EUKREA_CPUIMX51SD=y
CONFIG_SOC_IMX50=y