diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /include/asm-x86 | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 0eaa9bf6011..ad9cd6d49bf 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@ -249,25 +249,5 @@ static inline int dma_get_cache_alignment(void) #define dma_is_consistent(d, h) (1) -#ifdef CONFIG_X86_32 -# define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY -struct dma_coherent_mem { - void *virt_base; - u32 device_base; - int size; - int flags; - unsigned long *bitmap; -}; - -extern int -dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, - dma_addr_t device_addr, size_t size, int flags); - -extern void -dma_release_declared_memory(struct device *dev); - -extern void * -dma_mark_declared_memory_occupied(struct device *dev, - dma_addr_t device_addr, size_t size); -#endif /* CONFIG_X86_32 */ +#include <asm-generic/dma-coherent.h> #endif |