aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r--arch/parisc/kernel/pci-dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index d9b447cb1a0d..ae6213d71670 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -359,7 +359,7 @@ pcxl_dma_init(void)
359 359
360__initcall(pcxl_dma_init); 360__initcall(pcxl_dma_init);
361 361
362static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flag) 362static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
363{ 363{
364 unsigned long vaddr; 364 unsigned long vaddr;
365 unsigned long paddr; 365 unsigned long paddr;
@@ -512,13 +512,13 @@ struct hppa_dma_ops pcxl_dma_ops = {
512}; 512};
513 513
514static void *fail_alloc_consistent(struct device *dev, size_t size, 514static void *fail_alloc_consistent(struct device *dev, size_t size,
515 dma_addr_t *dma_handle, int flag) 515 dma_addr_t *dma_handle, gfp_t flag)
516{ 516{
517 return NULL; 517 return NULL;
518} 518}
519 519
520static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size, 520static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size,
521 dma_addr_t *dma_handle, int flag) 521 dma_addr_t *dma_handle, gfp_t flag)
522{ 522{
523 void *addr = NULL; 523 void *addr = NULL;
524 524