Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h
index 6aaf9939a716212d5c16fbb505bad98b32629435..23f789c80845c5d8814343bfa910d82e701a14b3 100644 (file)
--- a/include/asm-mips/dma.h
+++ b/include/asm-mips/dma.h
@@ -12,7 +12,6 @@
 #ifndef _ASM_DMA_H
 #define _ASM_DMA_H
 
-#include <linux/config.h>
 #include <asm/io.h>                    /* need byte IO */
 #include <linux/spinlock.h>            /* And spinlocks */
 #include <linux/delay.h>
@@ -75,7 +74,9 @@
  *
  */
 
+#ifndef 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