---

yaml --- r: 270203 b: refs/heads/master c: 1710871 h: refs/heads/master i: 270201: 833a29a 270199: 7c1b0db v: v3
git-mirror · Oct 13, 2011 · e87c201 · e87c201
1 parent 97a1a2f
commit e87c201
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: 6b1f1005f3dbc6fe52c68c2fccb525a0ebcc9afa
+refs/heads/master: 17108711c556b44c1d805bbb3f3ac81011c5dd6a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -341,6 +341,7 @@ config ARCH_CNS3XXX
 	select ARM_GIC
 	select MIGHT_HAVE_PCI
 	select PCI_DOMAINS if PCI
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Cavium Networks CNS3XXX platform.
 

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