---

yaml --- r: 361395 b: refs/heads/master c: 8dda05c h: refs/heads/master i: 361393: f9a2fe3 361391: b3c3a47 v: v3
git-mirror · Mar 15, 2013 · 8354069 · 8354069
1 parent fba9192
commit 8354069
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04cf1440c0fbb320ddea00ef878c7b53c7b7298c
+refs/heads/master: 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1005,12 +1005,12 @@ config ARCH_MULTI_V4_V5
 	bool
 
 config ARCH_MULTI_V6
-	bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+	bool "ARMv6 based platforms (ARM11)"
 	select ARCH_MULTI_V6_V7
 	select CPU_V6
 
 config ARCH_MULTI_V7
-	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
 	select ARCH_VEXPRESS