summaryrefslogtreecommitdiff
path: root/include/asm-m68k/dma-mapping.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-12-07 07:38:54 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 19:39:41 +0300
commitf67637ee4b5d90d41160d755b9a8cca18c394586 (patch)
treedffa1fa32f8e0462c8e46c4f8fefa058be349d6a /include/asm-m68k/dma-mapping.h
parent83b7b44e1c1e9e493ccd4146558481ab5af0116a (diff)
downloadlinux-f67637ee4b5d90d41160d755b9a8cca18c394586.tar.xz
[PATCH] Add struct dev pointer to dma_is_consistent()
dma_is_consistent() is ill-designed in that it does not have a struct device pointer argument which makes proper support for systems that consist of a mix of coherent and non-coherent DMA devices hard. Change dma_is_consistent to take a struct device pointer as first argument and fix the sole caller to pass it. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k/dma-mapping.h')
-rw-r--r--include/asm-m68k/dma-mapping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h
index d90d841d3dfd..efc89c12f837 100644
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -21,7 +21,7 @@ static inline int dma_get_cache_alignment(void)
return 1 << L1_CACHE_SHIFT;
}
-static inline int dma_is_consistent(dma_addr_t dma_addr)
+static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
{
return 0;
}