---

yaml --- r: 270204 b: refs/heads/master c: 9b15e4f h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · b041f07 · b041f07
1 parent e87c201
commit b041f07
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17108711c556b44c1d805bbb3f3ac81011c5dd6a
+refs/heads/master: 9b15e4fe00a136471d4ad22debcb0b270401cefc
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -578,6 +578,7 @@ config ARCH_MMP
 	select TICK_ONESHOT
 	select PLAT_PXA
 	select SPARSE_IRQ
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
 

diff --git a/trunk/arch/arm/mach-mmp/include/mach/memory.h b/trunk/arch/arm/mach-mmp/include/mach/memory.h