From cba89e231f97139dc6013030210624efd1087f68 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 12 Jun 2009 15:11:17 +1000 Subject: 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 --- arch/m68k/include/asm/dma_mm.h | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 arch/m68k/include/asm/dma_mm.h (limited to 'arch/m68k/include/asm/dma_mm.h') diff --git a/arch/m68k/include/asm/dma_mm.h b/arch/m68k/include/asm/dma_mm.h deleted file mode 100644 index 4240fbc946f8..000000000000 --- 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 */ -- cgit v1.2.3-59-g8ed1b