git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull altix-fpga-reset into release branch
[sfrench/cifs-2.6.git]
/
arch
/
ppc64
/
kernel
/
dma.c
diff --git
a/arch/ppc64/kernel/dma.c
b/arch/ppc64/kernel/dma.c
index 4da8e31b2b61da90c4bd93b49d630687049ad5d4..7c3419656ccce2f96fe98cd7a5362f6ab6bd671b 100644
(file)
--- a/
arch/ppc64/kernel/dma.c
+++ b/
arch/ppc64/kernel/dma.c
@@
-53,7
+53,7
@@
int dma_set_mask(struct device *dev, u64 dma_mask)
EXPORT_SYMBOL(dma_set_mask);
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle,
unsigned int __nocas
t flag)
+ dma_addr_t *dma_handle,
gfp_
t flag)
{
struct dma_mapping_ops *dma_ops = get_dma_ops(dev);