Merge ../bleed-2.6

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

diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86_64/dma-mapping.h
index e784fdc524f1ac7be2dce7930995cccab58dc0f6..54a380efed413fda6d8c0bf155d4f2ace1a6753c 100644 (file)
--- a/include/asm-x86_64/dma-mapping.h
+++ b/include/asm-x86_64/dma-mapping.h
@@ -17,7 +17,7 @@ extern dma_addr_t bad_dma_address;
        (swiotlb ? swiotlb_dma_mapping_error(x) : ((x) == bad_dma_address))
 
 void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                        unsigned gfp);
+                        gfp_t gfp);
 void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
                         dma_addr_t dma_handle);