]> bbs.cooldavid.org Git - net-next-2.6.git/commit
m68k: merge mmu and non-mmu versions of dma.h
authorGreg Ungerer <gerg@uclinux.org>
Fri, 12 Jun 2009 05:11:17 +0000 (15:11 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 15 Sep 2009 23:43:38 +0000 (09:43 +1000)
commitcba89e231f97139dc6013030210624efd1087f68
tree51a1c248e3188f171526b1df88f86b3dc7cd64f0
parent6192c1ea0ac5806592c5c9cc2b2b94b0298df02b
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>
arch/m68k/include/asm/dma.h
arch/m68k/include/asm/dma_mm.h [deleted file]
arch/m68k/include/asm/dma_no.h [deleted file]