From 58ba81dba77eab43633ea47d82e96245ae3ff666 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 9 Oct 2006 02:11:47 +0100 Subject: [PATCH] [PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- arch/m68k/kernel/Makefile | 3 ++- include/asm-m68k/dma-mapping.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index dae609797d..1c9ecaa473 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -9,10 +9,11 @@ else endif extra-y += vmlinux.lds -obj-y := entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \ +obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \ sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o obj-$(CONFIG_PCI) += bios32.o obj-$(CONFIG_MODULES) += module.o +obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo EXTRA_AFLAGS := -traditional diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h index c1299c3beb..d90d841d3d 100644 --- a/include/asm-m68k/dma-mapping.h +++ b/include/asm-m68k/dma-mapping.h @@ -5,6 +5,7 @@ struct scatterlist; +#ifndef CONFIG_MMU_SUN3 static inline int dma_supported(struct device *dev, u64 mask) { return 1; @@ -88,4 +89,8 @@ static inline int dma_mapping_error(dma_addr_t handle) return 0; } +#else +#include +#endif + #endif /* _M68K_DMA_MAPPING_H */ -- 2.39.5