dma-mapping: add the device argument to dma_mapping_error()

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

diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h
index 00259ed6fc9532487dda91ec8873febfe0d33a59..91f7944333d49d6ce2f861036cddf0492ce76b9c 100644 (file)
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -32,7 +32,7 @@ extern void dma_free_coherent(struct device *, size_t,
                              void *, dma_addr_t);
 
 static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
-                                         dma_addr_t *handle, int flag)
+                                         dma_addr_t *handle, gfp_t flag)
 {
        return dma_alloc_coherent(dev, size, handle, flag);
 }
@@ -84,7 +84,7 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *s
 {
 }
 
-static inline int dma_mapping_error(dma_addr_t handle)
+static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
 {
        return 0;
 }