X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-generic%2Fdma-mapping-broken.h;h=a7f1a55ce6b0a07b2bf7850e4dda29c3eb88d67d;hb=4203cbbdfb5b93b8682b9698f3fce5a1d0674321;hp=e3185b194c3e4820ca6e2441b1dc4a73e0813f15;hpb=daddc0d38b3571bed170afa273a49a0eba090c1e;p=linux-2.6.git

diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h
index e3185b194..a7f1a55ce 100644
--- a/include/asm-generic/dma-mapping-broken.h
+++ b/include/asm-generic/dma-mapping-broken.h
@@ -6,10 +6,10 @@
 
 static inline void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-		   int flag)
+		   gfp_t flag)
 {
 	BUG();
-	return 0;
+	return NULL;
 }
 
 static inline void