Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / include / asm-mips / dma.h

diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h
index e85849ac165fc5a1f30811328e3b8a20577c634d..833437d31ef1634c1286d957b8cca8971bc158f2 100644 (file)
--- a/include/asm-mips/dma.h
+++ b/include/asm-mips/dma.h
@@ -74,7 +74,9 @@
  *
  */
 
+#ifndef CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN
 #define MAX_DMA_CHANNELS       8
+#endif
 
 /*
  * The maximum address in KSEG0 that we can perform a DMA transfer to on this
@@ -89,6 +91,7 @@
 #else
 #define MAX_DMA_ADDRESS                (PAGE_OFFSET + 0x01000000)
 #endif
+#define MAX_DMA_PFN            PFN_DOWN(virt_to_phys((void *)MAX_DMA_ADDRESS))
 
 /* 8237 DMA controllers */
 #define IO_DMA1_BASE   0x00    /* 8 bit slave DMA, channels 0..3 */