Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / include / mach / memory.h

diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h
index 59aef89808d6609cb371c4bf1d15b78fcd52dd19..f626730ee42e11a8071149677b43f55fb85666a7 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/memory.h
+++ b/arch/arm/mach-pxa/include/mach/memory.h
@@ -17,16 +17,6 @@
  */
 #define PHYS_OFFSET    UL(0xa0000000)
 
-/*
- * Virtual view <-> DMA view memory address translations
- * virt_to_bus: Used to translate the virtual address to an
- *             address suitable to be passed to set_dma_addr
- * bus_to_virt: Used to convert an address for DMA operations
- *             to an address that the kernel can use.
- */
-#define __virt_to_bus(x)        __virt_to_phys(x)
-#define __bus_to_virt(x)        __phys_to_virt(x)
-
 /*
  * The nodes are matched with the physical SDRAM banks as follows:
  *
@@ -47,6 +37,7 @@ void cmx2xx_pci_adjust_zones(int node, unsigned long *size,
        cmx2xx_pci_adjust_zones(node, size, holes)
 
 #define ISA_DMA_THRESHOLD      (PHYS_OFFSET + SZ_64M - 1)
+#define MAX_DMA_ADDRESS                (PAGE_OFFSET + SZ_64M)
 #endif
 
 #endif