ARM: mach-prima2: remove mach/memory.h

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
mariux64 · Oct 13, 2011 · 17dea45 · 17dea45
1 parent f431eb6
commit 17dea45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -365,6 +365,7 @@ config ARCH_PRIMA2
 	select GENERIC_IRQ_CHIP
 	select USE_OF
 	select ZONE_DMA
+	select NO_MACH_MEMORY_H
 	help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 

diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h
diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
@@ -13,7 +13,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
 
 #define L2X0_ADDR_FILTERING_START       0xC00
 #define L2X0_ADDR_FILTERING_END         0xC04
@@ -41,9 +40,9 @@ static int __init sirfsoc_of_l2x_init(void)
 		/*
 		 * set the physical memory windows L2 cache will cover
 		 */
-		writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
+		writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024,
 			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-		writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
+		writel_relaxed(PHYS_OFFSET | 0x1,
 			sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
 
 		writel_relaxed(0,