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 asus into release branch
[pandora-kernel.git]
/
include
/
asm-m68k
/
dma-mapping.h
diff --git
a/include/asm-m68k/dma-mapping.h
b/include/asm-m68k/dma-mapping.h
index
00259ed
..
a26cdeb
100644
(file)
--- a/
include/asm-m68k/dma-mapping.h
+++ b/
include/asm-m68k/dma-mapping.h
@@
-32,7
+32,7
@@
extern void dma_free_coherent(struct device *, size_t,
void *, dma_addr_t);
static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
- dma_addr_t *handle,
in
t flag)
+ dma_addr_t *handle,
gfp_
t flag)
{
return dma_alloc_coherent(dev, size, handle, flag);
}