Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / arch / arm / mach-h720x / include / mach / memory.h

diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h
index 9d36876..b0b3bae 100644 (file)
--- a/arch/arm/mach-h720x/include/mach/memory.h
+++ b/arch/arm/mach-h720x/include/mach/memory.h
@@ -13,7 +13,6 @@
  * There should not be more than (0xd0000000 - 0xc0000000)
  * bytes of RAM.
  */
-#define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_256M - 1)
-#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_256M)
+#define ARM_DMA_ZONE_SIZE      SZ_256M
 
 #endif