---

yaml --- r: 270188 b: refs/heads/master c: e2c72ff h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · 18686cd · 18686cd
1 parent d7dcf42
commit 18686cd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b5da2df272d5aaceb17addae8afc068b447aa51
+refs/heads/master: e2c72ff9dc535e2be25736b11a42d53dfffcfbb6
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -541,6 +541,7 @@ config ARCH_MV78XX0
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
 	select PLAT_ORION
+	select NO_MACH_MEMORY_H
 	help
 	  Support for the following Marvell MV78xx0 series SoCs:
 	  MV781x0, MV782x0.

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