From: Magnus Lilja <lilja.magnus@gmail.com>
Date: Sat, 18 Apr 2009 16:20:50 +0000 (+0200)
Subject: i.MX31: Disable CPU_32v6K in mx3_defconfig.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25971dfe3a9d14c3b91fc51de96d7f48da394c99;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

i.MX31: Disable CPU_32v6K in mx3_defconfig.

The i.MX31 ARM11 core is not a v6K core. Disable this option as it
is incompatible with non v6K cores.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
index 72a8201a5370..20ada526f6de 100644
--- a/arch/arm/configs/mx3_defconfig
+++ b/arch/arm/configs/mx3_defconfig
@@ -197,7 +197,7 @@ CONFIG_MXC_PWM=y
 #
 CONFIG_CPU_32=y
 CONFIG_CPU_V6=y
-CONFIG_CPU_32v6K=y
+# CONFIG_CPU_32v6K is not set
 CONFIG_CPU_32v6=y
 CONFIG_CPU_ABRT_EV6=y
 CONFIG_CPU_PABRT_NOIFAR=y