From b6a5782ade159de63625b8eed6138d7633bca1a6 Mon Sep 17 00:00:00 2001
From: Magnus Lilja <lilja.magnus@gmail.com>
Date: Sat, 18 Apr 2009 18:20:50 +0200
Subject: [PATCH] --- yaml --- r: 144675 b: refs/heads/master c:
 25971dfe3a9d14c3b91fc51de96d7f48da394c99 h: refs/heads/master i:   144673:
 2080612ea38bb7a85f43087939ff20b42e2ff1ee   144671:
 1ad08e3eeef5fccfaf25630bc514c892ee853993 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/configs/mx3_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0588f87c3e5f..248c4800f129 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b09de4209d179c92ab880d911e72a892d053ff01
+refs/heads/master: 25971dfe3a9d14c3b91fc51de96d7f48da394c99
diff --git a/trunk/arch/arm/configs/mx3_defconfig b/trunk/arch/arm/configs/mx3_defconfig
index 72a8201a5370..20ada526f6de 100644
--- a/trunk/arch/arm/configs/mx3_defconfig
+++ b/trunk/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