diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 02:11:47 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 18:50:58 -0700 |
| commit | 58ba81dba77eab43633ea47d82e96245ae3ff666 (patch) | |
| tree | 4bdb3972b466b604c13407b2b32226259304bf53 | |
| parent | [PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... (diff) | |
| download | linux-dev-58ba81dba77eab43633ea47d82e96245ae3ff666.tar.xz linux-dev-58ba81dba77eab43633ea47d82e96245ae3ff666.zip | |
[PATCH] m68k/kernel/dma.c assumes !MMU_SUN3
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/m68k/kernel/Makefile | 3 | ||||
| -rw-r--r-- | include/asm-m68k/dma-mapping.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index dae609797dc0..1c9ecaa473d5 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 c1299c3beb50..d90d841d3dfd 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 <asm-generic/dma-mapping-broken.h> +#endif + #endif /* _M68K_DMA_MAPPING_H */ |