From: Greg Ungerer Date: Wed, 2 May 2012 07:06:22 +0000 (+1000) Subject: m68k: merge the MMU and non-MMU versions of the arch dma code X-Git-Tag: v3.5-rc1~169^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5641686c234ffe5fbcb1728ac45016761b318839;p=pandora-kernel.git 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 Acked-by: Geert Uytterhoeven --- Reading git-diff-tree failed