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
Merge branch 'topic/hdsp' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
dma.c
diff --git
a/arch/powerpc/kernel/dma.c
b/arch/powerpc/kernel/dma.c
index
53c7788
..
6b02793
100644
(file)
--- a/
arch/powerpc/kernel/dma.c
+++ b/
arch/powerpc/kernel/dma.c
@@
-32,7
+32,7
@@
void *dma_direct_alloc_coherent(struct device *dev, size_t size,
{
void *ret;
#ifdef CONFIG_NOT_COHERENT_CACHE
- ret = __dma_alloc_coherent(size, dma_handle, flag);
+ ret = __dma_alloc_coherent(
dev,
size, dma_handle, flag);
if (ret == NULL)
return NULL;
*dma_handle += get_dma_direct_offset(dev);