diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
| commit | 96b88fb850cc419171f926ad04650ec509e9f543 (patch) | |
| tree | 5bf9537bde467534608b3acdbfa5f7726ede8c3f /arch/frv/mm/dma-alloc.c | |
| parent | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/frv/mm/dma-alloc.c')
| -rw-r--r-- | arch/frv/mm/dma-alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c index 4b38d45435f..cfc4f97490c 100644 --- a/arch/frv/mm/dma-alloc.c +++ b/arch/frv/mm/dma-alloc.c @@ -81,7 +81,7 @@ static int map_page(unsigned long va, unsigned long pa, pgprot_t prot) * portions of the kernel with single large page TLB entries, and * still get unique uncached pages for consistent DMA. */ -void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) +void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle) { struct vm_struct *area; unsigned long page, va, pa; |