diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/asm-ppc/dma.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/asm-ppc/dma.h')
| -rw-r--r-- | include/asm-ppc/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/dma.h b/include/asm-ppc/dma.h index 3e980e353..dfd6a240b 100644 --- a/include/asm-ppc/dma.h +++ b/include/asm-ppc/dma.h @@ -8,7 +8,7 @@ #include <linux/config.h> #include <asm/io.h> -#include <asm/spinlock.h> +#include <linux/spinlock.h> #include <asm/system.h> /* @@ -399,7 +399,7 @@ static __inline__ int get_dma_residue(unsigned int dmanr) extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ extern void free_dma(unsigned int dmanr); /* release it again */ -#ifdef CONFIG_PCI_QUIRKS +#ifdef CONFIG_PCI extern int isa_dma_bridge_buggy; #else #define isa_dma_bridge_buggy (0) |