Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[sfrench/cifs-2.6.git] / arch / arm / mach-sa1100 / include / mach / memory.h

diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h
index a44da6a2916c9cfc02e9f6ee3ea0e8caa3923b1e..cff31ee246b770ad3566eb1ccafc1ed938d52864 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/memory.h
+++ b/arch/arm/mach-sa1100/include/mach/memory.h
@@ -14,18 +14,8 @@
  */
 #define PLAT_PHYS_OFFSET       UL(0xc0000000)
 
-#ifndef __ASSEMBLY__
-
 #ifdef CONFIG_SA1111
-void sa1111_adjust_zones(unsigned long *size, unsigned long *holes);
-
-#define arch_adjust_zones(size, holes) \
-       sa1111_adjust_zones(size, holes)
-
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_1M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_1M)
-
-#endif
+#define ARM_DMA_ZONE_SIZE      SZ_1M
 #endif
 
 /*