---

yaml --- r: 270182 b: refs/heads/master c: 748e91c h: refs/heads/master v: v3
git-mirror · Sep 26, 2011 · f41c9f1 · f41c9f1
1 parent d9cda0d
commit f41c9f1
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: e33e51070cbe8979a9aac43a6d5e773eaa44f9b1
+refs/heads/master: 748e91cb3c6040a73b63afc348fe3d6042bdeef3
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -514,6 +514,7 @@ config ARCH_KIRKWOOD
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
 	select PLAT_ORION
+	select NO_MACH_MEMORY_H
 	help
 	  Support for the following Marvell Kirkwood series SoCs:
 	  88F6180, 88F6192 and 88F6281.

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