---

yaml --- r: 270186 b: refs/heads/master c: 8cfc1ef h: refs/heads/master v: v3
git-mirror · Sep 26, 2011 · 167dc35 · 167dc35
1 parent 2a4a81a
commit 167dc35
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7743a087640cbb0b5d81ee8a73b7ffed468f7bb6
+refs/heads/master: 8cfc1ef96a873d35d2fb86ac8ccf34d388a48e55
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -462,6 +462,7 @@ config ARCH_IOP33X
 	select PLAT_IOP
 	select PCI
 	select ARCH_REQUIRE_GPIOLIB
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Intel's IOP33X (XScale) family of processors.
 

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