---

yaml --- r: 270194 b: refs/heads/master c: 6d3f8b4 h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · f21ee34 · f21ee34
1 parent d6d5099
commit f21ee34
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b0e7f69ad24613c09a1bb6632d448885cf7b034
+refs/heads/master: 6d3f8b40f4b6b832491617be510970157264513a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -863,6 +863,7 @@ config ARCH_U8500
 	select CLKDEV_LOOKUP
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_CPUFREQ
+	select NO_MACH_MEMORY_H
 	help
 	  Support for ST-Ericsson's Ux500 architecture
 

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