summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMagnus Lilja <lilja.magnus@gmail.com>2009-04-18 18:20:50 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-05-05 09:38:04 +0200
commit25971dfe3a9d14c3b91fc51de96d7f48da394c99 (patch)
tree838d3f8e9970ad232bbdd37391fef5ac496c181f /arch
parentb09de4209d179c92ab880d911e72a892d053ff01 (diff)
downloadop-kernel-dev-25971dfe3a9d14c3b91fc51de96d7f48da394c99.zip
op-kernel-dev-25971dfe3a9d14c3b91fc51de96d7f48da394c99.tar.gz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/mx3_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
index 72a8201..20ada52 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
OpenPOWER on IntegriCloud