---

yaml --- r: 270189 b: refs/heads/master c: 34561b5 h: refs/heads/master i: 270187: d7dcf42 v: v3
git-mirror · Oct 13, 2011 · 9eb804e · 9eb804e
1 parent 18686cd
commit 9eb804e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2c72ff9dc535e2be25736b11a42d53dfffcfbb6
+refs/heads/master: 34561b557ff0a3ee0c4bdaf5a5198246e41826e4
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -301,6 +301,7 @@ config ARCH_VEXPRESS
 	select ICST
 	select PLAT_VERSATILE
 	select PLAT_VERSATILE_CLCD
+	select NO_MACH_MEMORY_H
 	help
 	  This enables support for the ARM Ltd Versatile Express boards.
 

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