---

yaml --- r: 270185 b: refs/heads/master c: 7743a08 h: refs/heads/master i: 270183: f262585 v: v3
git-mirror · Sep 26, 2011 · 2a4a81a · 2a4a81a
1 parent 4b1e942
commit 2a4a81a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 52 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee581ae83f6e7878ff937bc0a5724173f1960130
+refs/heads/master: 7743a087640cbb0b5d81ee8a73b7ffed468f7bb6
diff --git a/trunk/arch/arm/mach-omap2/include/mach/memory.h b/trunk/arch/arm/mach-omap2/include/mach/memory.h
diff --git a/trunk/arch/arm/plat-omap/Kconfig b/trunk/arch/arm/plat-omap/Kconfig
@@ -22,6 +22,7 @@ config ARCH_OMAP2PLUS
 	select CLKDEV_LOOKUP
 	select GENERIC_IRQ_CHIP
 	select OMAP_DM_TIMER
+	select NO_MACH_MEMORY_H
 	help
 	  "Systems based on OMAP2, OMAP3 or OMAP4"
 

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