git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull release into acpica branch
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
pci
/
dma.c
diff --git
a/arch/cris/arch-v32/drivers/pci/dma.c
b/arch/cris/arch-v32/drivers/pci/dma.c
index
1032930
..
426b098
100644
(file)
--- a/
arch/cris/arch-v32/drivers/pci/dma.c
+++ b/
arch/cris/arch-v32/drivers/pci/dma.c
@@
-24,7
+24,7
@@
struct dma_coherent_mem {
};
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle,
unsigned int __nocas
t gfp)
+ dma_addr_t *dma_handle,
gfp_
t gfp)
{
void *ret;
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;