Merge branch 'linus' into core/generic-dma-coherent

[linux-2.6-omap-h63xx.git] / include / asm-cris / dma-mapping.h

diff --git a/include/asm-cris/dma-mapping.h b/include/asm-cris/dma-mapping.h
index 4f58670caad52b3b1d9d325359ac183fb8fa2ded..da8ef8e8f842733751a33985879e07057e6af523 100644 (file)
--- a/include/asm-cris/dma-mapping.h
+++ b/include/asm-cris/dma-mapping.h
@@ -122,7 +122,7 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
 }
 
 static inline int
-dma_mapping_error(dma_addr_t dma_addr)
+dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
        return 0;
 }