---

yaml --- r: 270201 b: refs/heads/master c: a109d81 h: refs/heads/master i: 270199: 7c1b0db v: v3
git-mirror · Oct 13, 2011 · 833a29a · 833a29a
1 parent 06c9a65
commit 833a29a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94cc0a78474078e7533ccc71e9b90ee3063c843a
+refs/heads/master: a109d811bab30d44ee775a9f15348add7014180c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -416,6 +416,7 @@ config ARCH_MXS
 	select ARCH_REQUIRE_GPIOLIB
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Freescale MXS-based family of processors
 

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