aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-08 21:11:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 21:50:58 -0400
commit58ba81dba77eab43633ea47d82e96245ae3ff666 (patch)
tree4bdb3972b466b604c13407b2b32226259304bf53 /include
parent1622605cf6e15bfdc55a3dc78b792018edded435 (diff)
[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')
-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 @@
5 5
6struct scatterlist; 6struct scatterlist;
7 7
8#ifndef CONFIG_MMU_SUN3
8static inline int dma_supported(struct device *dev, u64 mask) 9static inline int dma_supported(struct device *dev, u64 mask)
9{ 10{
10 return 1; 11 return 1;
@@ -88,4 +89,8 @@ static inline int dma_mapping_error(dma_addr_t handle)
88 return 0; 89 return 0;
89} 90}
90 91
92#else
93#include <asm-generic/dma-mapping-broken.h>
94#endif
95
91#endif /* _M68K_DMA_MAPPING_H */ 96#endif /* _M68K_DMA_MAPPING_H */