From ceca80d66e54a613ab62172dddbdc7f3ff615388 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 27 Dec 2012 20:07:39 +0100 Subject: [PATCH] --- yaml --- r: 351121 b: refs/heads/master c: 561839598e61f03c9175183ea066b2b7fa58ce85 h: refs/heads/master i: 351119: 435f7877db085e765a07523d95888d8c3ad8af07 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/dma-mapping.h | 5 ----- trunk/arch/m68k/kernel/Makefile | 4 +--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 225fdd7a0f29..0c471d4e3f79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243eeb78906e17a18faacb492facd3284993f220 +refs/heads/master: 561839598e61f03c9175183ea066b2b7fa58ce85 diff --git a/trunk/arch/m68k/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping.h index 292805f0762e..05aa53594d49 100644 --- a/trunk/arch/m68k/include/asm/dma-mapping.h +++ b/trunk/arch/m68k/include/asm/dma-mapping.h @@ -5,7 +5,6 @@ struct scatterlist; -#ifndef CONFIG_MMU_SUN3 static inline int dma_supported(struct device *dev, u64 mask) { return 1; @@ -111,10 +110,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) return 0; } -#else -#include -#endif - /* drivers/base/dma-mapping.c */ extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size); diff --git a/trunk/arch/m68k/kernel/Makefile b/trunk/arch/m68k/kernel/Makefile index 068ad49210d6..655347d80780 100644 --- a/trunk/arch/m68k/kernel/Makefile +++ b/trunk/arch/m68k/kernel/Makefile @@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o obj-$(CONFIG_PCI) += pcibios.o -ifndef CONFIG_MMU_SUN3 -obj-y += dma.o -endif +obj-$(CONFIG_HAS_DMA) += dma.o