summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-09 03:11:47 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 03:50:58 +0200
commit58ba81dba77eab43633ea47d82e96245ae3ff666 (patch)
tree4bdb3972b466b604c13407b2b32226259304bf53 /include/asm-m68k
parent[PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... (diff)
downloadlinux-58ba81dba77eab43633ea47d82e96245ae3ff666.tar.xz
linux-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>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r--include/asm-m68k/dma-mapping.h5
1 files changed, 5 insertions, 0 deletions
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 */