summaryrefslogtreecommitdiffstats
path: root/drivers/parisc/ccio-dma.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /drivers/parisc/ccio-dma.c
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadkernel-crypto-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.gz
kernel-crypto-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.xz
kernel-crypto-210cc679faf0e1cabda9fc5d1279644f5e52aecb.zip
Auto-update from upstream
Diffstat (limited to 'drivers/parisc/ccio-dma.c')
-rw-r--r--drivers/parisc/ccio-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index f1c442ab910..9e0229f7e25 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -836,7 +836,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
* This function implements the pci_alloc_consistent function.
*/
static void *
-ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)
+ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
{
void *ret;
#if 0