diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-06-12 15:11:17 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-16 09:43:38 +1000 |
| commit | cba89e231f97139dc6013030210624efd1087f68 (patch) | |
| tree | 51a1c248e3188f171526b1df88f86b3dc7cd64f0 /arch/m68k/include/asm/dma_mm.h | |
| parent | 6192c1ea0ac5806592c5c9cc2b2b94b0298df02b (diff) | |
m68k: merge mmu and non-mmu versions of dma.h
The non-mmu version of dma.h contains a lot of ColdFire specific DMA
support, but also all of the base m68k support. So use the non-mmu
version of dma.h for all.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/dma_mm.h')
| -rw-r--r-- | arch/m68k/include/asm/dma_mm.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/m68k/include/asm/dma_mm.h b/arch/m68k/include/asm/dma_mm.h deleted file mode 100644 index 4240fbc946f..00000000000 --- a/arch/m68k/include/asm/dma_mm.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _M68K_DMA_H -#define _M68K_DMA_H 1 - - -/* it's useless on the m68k, but unfortunately needed by the new - bootmem allocator (but this should do it for this) */ -#define MAX_DMA_ADDRESS PAGE_OFFSET - -#define MAX_DMA_CHANNELS 8 - -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 */ - -#define isa_dma_bridge_buggy (0) - -#endif /* _M68K_DMA_H */ |