aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel/Makefile
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-12-27 20:07:39 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-02-09 14:23:36 +0100
commit561839598e61f03c9175183ea066b2b7fa58ce85 (patch)
tree8c394e534b106a6236964a3b067461a350a64bf8 /arch/m68k/kernel/Makefile
parent243eeb78906e17a18faacb492facd3284993f220 (diff)
downloadlinux-linaro-stable-561839598e61f03c9175183ea066b2b7fa58ce85.tar.gz
m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
In two places, we check !CONFIG_MMU_SUN3 while we should check CONFIG_HAS_DMA instead. While fixing this, the check in <asm/dma-mapping.h> became redundant (<linux/dma-mapping.h> already handles this case), so just remove it. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel/Makefile')
-rw-r--r--arch/m68k/kernel/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 068ad49210d6..655347d80780 100644
--- a/arch/m68k/kernel/Makefile
+++ b/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