diff options
Diffstat (limited to 'arch/parisc/kernel/pci-dma.c')
-rw-r--r-- | arch/parisc/kernel/pci-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index 368cc095c99f..844c2877a2e3 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c | |||
@@ -349,7 +349,7 @@ pcxl_dma_init(void) | |||
349 | 349 | ||
350 | __initcall(pcxl_dma_init); | 350 | __initcall(pcxl_dma_init); |
351 | 351 | ||
352 | static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flag) | 352 | static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) |
353 | { | 353 | { |
354 | unsigned long vaddr; | 354 | unsigned long vaddr; |
355 | unsigned long paddr; | 355 | unsigned long paddr; |
@@ -502,13 +502,13 @@ struct hppa_dma_ops pcxl_dma_ops = { | |||
502 | }; | 502 | }; |
503 | 503 | ||
504 | static void *fail_alloc_consistent(struct device *dev, size_t size, | 504 | static void *fail_alloc_consistent(struct device *dev, size_t size, |
505 | dma_addr_t *dma_handle, int flag) | 505 | dma_addr_t *dma_handle, gfp_t flag) |
506 | { | 506 | { |
507 | return NULL; | 507 | return NULL; |
508 | } | 508 | } |
509 | 509 | ||
510 | static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size, | 510 | static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size, |
511 | dma_addr_t *dma_handle, int flag) | 511 | dma_addr_t *dma_handle, gfp_t flag) |
512 | { | 512 | { |
513 | void *addr = NULL; | 513 | void *addr = NULL; |
514 | 514 | ||