---

yaml --- r: 270195 b: refs/heads/master c: 2f93c88 h: refs/heads/master i: 270193: d6d5099 270191: 78cbd46 v: v3
git-mirror · Oct 13, 2011 · 530f800 · 530f800
1 parent f21ee34
commit 530f800
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3f8b40f4b6b832491617be510970157264513a
+refs/heads/master: 2f93c8885bdb18e365e087badc076e7514b8a951
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -285,6 +285,7 @@ config ARCH_VERSATILE
 	select PLAT_VERSATILE_CLCD
 	select PLAT_VERSATILE_FPGA_IRQ
 	select ARM_TIMER_SP804
+	select NO_MACH_MEMORY_H
 	help
 	  This enables support for ARM Ltd Versatile board.
 

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