From 4aa79a67ca65f52c1796c0bd2d61ec7ba6e94714 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Thu, 25 Nov 2010 14:21:32 +0800 Subject: [PATCH] --- yaml --- r: 225949 b: refs/heads/master c: d38bdf48f30f5dc0fac4c1ab656aff74f6804f07 h: refs/heads/master i: 225947: e163cd6b22d193f9721c27d31afcb628de5f4fec v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mmp/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4df15e17769b..e64fff06cb26 100644 --- 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 index 95e7c4abb27f..5772e592fe61 100644 --- 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"