projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/x86
[powerpc.git]
/
arch
/
xtensa
/
kernel
/
pci-dma.c
diff --git
a/arch/xtensa/kernel/pci-dma.c
b/arch/xtensa/kernel/pci-dma.c
index
84fde25
..
1ff8226
100644
(file)
--- a/
arch/xtensa/kernel/pci-dma.c
+++ b/
arch/xtensa/kernel/pci-dma.c
@@
-29,7
+29,7
@@
*/
void *
*/
void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle,
in
t gfp)
+dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle,
gfp_
t gfp)
{
void *ret;
{
void *ret;