---

yaml --- r: 225949 b: refs/heads/master c: d38bdf4 h: refs/heads/master i: 225947: e163cd6 v: v3
git-mirror · Dec 16, 2010 · 4aa79a6 · 4aa79a6
1 parent 5234d10
commit 4aa79a6
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: 13dee960f37b3769baa0eae9d1de4a7ca9a2e999
+refs/heads/master: d38bdf48f30f5dc0fac4c1ab656aff74f6804f07
diff --git a/trunk/arch/arm/mach-mmp/Kconfig b/trunk/arch/arm/mach-mmp/Kconfig
@@ -56,7 +56,7 @@ config MACH_FLINT
 	  Flint Development Platform.
 	  MMP2-based board can't be co-existed with PXA168-based &
 	  PXA910-based development board. Since MMP2 is compatible to
-	  ARMv6 architecture.
+	  ARMv7 architecture.
 
 config MACH_MARVELL_JASPER
 	bool "Marvell's Jasper Development Platform"
@@ -66,7 +66,7 @@ config MACH_MARVELL_JASPER
 	  Jasper Development Platform.
 	  MMP2-based board can't be co-existed with PXA168-based &
 	  PXA910-based development board. Since MMP2 is compatible to
-	  ARMv6 architecture.
+	  ARMv7 architecture.
 
 config MACH_TETON_BGA
 	bool "Marvell's PXA168 Teton BGA Development Board"