---

yaml --- r: 270183 b: refs/heads/master c: 8fce8b2 h: refs/heads/master i: 270181: d9cda0d 270179: 8167616 270175: d05d214 v: v3
git-mirror · Sep 26, 2011 · f262585 · f262585
1 parent f41c9f1
commit f262585
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 748e91cb3c6040a73b63afc348fe3d6042bdeef3
+refs/heads/master: 8fce8b2080bf49de9e5d96161932edcbffad11cf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -552,6 +552,7 @@ config ARCH_ORION5X
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
 	select PLAT_ORION
+	select NO_MACH_MEMORY_H
 	help
 	  Support for the following Marvell Orion 5x series SoCs:
 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

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