diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /include/asm-cris/dma.h | |
parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'include/asm-cris/dma.h')
-rw-r--r-- | include/asm-cris/dma.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-cris/dma.h b/include/asm-cris/dma.h index c229fac35cdc..6f188dc56138 100644 --- a/include/asm-cris/dma.h +++ b/include/asm-cris/dma.h | |||
@@ -10,4 +10,12 @@ | |||
10 | 10 | ||
11 | #define MAX_DMA_ADDRESS PAGE_OFFSET | 11 | #define MAX_DMA_ADDRESS PAGE_OFFSET |
12 | 12 | ||
13 | /* From PCI */ | ||
14 | |||
15 | #ifdef CONFIG_PCI | ||
16 | extern int isa_dma_bridge_buggy; | ||
17 | #else | ||
18 | #define isa_dma_bridge_buggy (0) | ||
19 | #endif | ||
20 | |||
13 | #endif /* _ASM_DMA_H */ | 21 | #endif /* _ASM_DMA_H */ |