Pull context-bitmap into release branch

[linux-block.git] / include / asm-frv / pci.h

diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h
index b4efe5e3591a5b22a7f511b606c13c4d3cf4b0ce..1168451c275fb1603892630bf3510a6899dace0b 100644 (file)
--- a/include/asm-frv/pci.h
+++ b/include/asm-frv/pci.h
@@ -32,7 +32,7 @@ extern void pcibios_set_master(struct pci_dev *dev);
 extern void pcibios_penalize_isa_irq(int irq);
 
 #ifdef CONFIG_MMU
-extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle);
+extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);
 extern void consistent_free(void *vaddr);
 extern void consistent_sync(void *vaddr, size_t size, int direction);
 extern void consistent_sync_page(struct page *page, unsigned long offset,