---

yaml --- r: 270196 b: refs/heads/master c: ff4067e h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · cb67d3a · cb67d3a
1 parent 530f800
commit cb67d3a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f93c8885bdb18e365e087badc076e7514b8a951
+refs/heads/master: ff4067e4cf61fff977cc5776020fb066c506ec4c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -424,6 +424,7 @@ config ARCH_NETX
 	select CPU_ARM926T
 	select ARM_VIC
 	select GENERIC_CLOCKEVENTS
+	select NO_MACH_MEMORY_H
 	help
 	  This enables support for systems based on the Hilscher NetX Soc
 

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