git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6192c1e)
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)
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 patch | blob | history
arch/m68k/include/asm/dma_mm.h [deleted file] patch | blob | history
arch/m68k/include/asm/dma_no.h [deleted file] patch | blob | history

diff --cc arch/m68k/include/asm/dma.h
Simple merge
diff --cc arch/m68k/include/asm/dma_mm.h
Simple merge
diff --cc arch/m68k/include/asm/dma_no.h
Simple merge
Pandora Kernel Repository