git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-mips
/
dma.h
diff --git
a/include/asm-mips/dma.h
b/include/asm-mips/dma.h
index
6aaf993
..
23f789c
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
#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>
#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
#define MAX_DMA_CHANNELS 8
+#endif
/*
* The maximum address in KSEG0 that we can perform a DMA transfer to on this
/*
* The maximum address in KSEG0 that we can perform a DMA transfer to on this