m68k: merge the MMU and non-MMU versions of the arch dma code
authorGreg Ungerer <gerg@uclinux.org>
Wed, 2 May 2012 07:06:22 +0000 (17:06 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Sun, 20 May 2012 11:22:56 +0000 (21:22 +1000)
commit5641686c234ffe5fbcb1728ac45016761b318839
tree86e7db78f80f455be6855edc2048e142411f2a78
parent1744bd921cd1037f0415574e0f8a3611984ecc7c
m68k: merge the MMU and non-MMU versions of the arch dma code

The majority of the m68k architecture dma code is the same, so merge the
current separated files dma_no.c and dma_mm.c back into a single dma.c

The main alloc and free routines are a little different, so we keep a
single #ifdef based on CONFIG_MMU for them. All the other support functions
are now identical.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/kernel/dma.c
arch/m68k/kernel/dma_mm.c [deleted file]
arch/m68k/kernel/dma_no.c [deleted file]