---

yaml --- r: 270216 b: refs/heads/master c: c039bad h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · ff972bd · ff972bd
1 parent 064660a
commit ff972bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17dea45adbd2c2df726699b25e2ddf8916d5eb87
+refs/heads/master: c039bad00f21a025df6fcb238578023c2cc881bf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -410,6 +410,7 @@ config ARCH_MXC
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
 	select HAVE_SCHED_CLOCK
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 

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