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 'fix/soundcore' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
mach-ip27
/
dma-coherence.h
diff --git
a/arch/mips/include/asm/mach-ip27/dma-coherence.h
b/arch/mips/include/asm/mach-ip27/dma-coherence.h
index
8676673
..
d3d0401
100644
(file)
--- a/
arch/mips/include/asm/mach-ip27/dma-coherence.h
+++ b/
arch/mips/include/asm/mach-ip27/dma-coherence.h
@@
-33,7
+33,8
@@
static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
return pa;
}
-static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
+static unsigned long plat_dma_addr_to_phys(struct device *dev,
+ dma_addr_t dma_addr)
{
return dma_addr & ~(0xffUL << 56);
}