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 branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
mach-ip32
/
dma-coherence.h
diff --git
a/arch/mips/include/asm/mach-ip32/dma-coherence.h
b/arch/mips/include/asm/mach-ip32/dma-coherence.h
index
3785595
..
c8fb5aa
100644
(file)
--- a/
arch/mips/include/asm/mach-ip32/dma-coherence.h
+++ b/
arch/mips/include/asm/mach-ip32/dma-coherence.h
@@
-37,7
+37,8
@@
static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
return pa;
}
return pa;
}
-static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
+static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
+ struct page *page)
{
dma_addr_t pa;
{
dma_addr_t pa;
@@
-50,7
+51,7
@@
static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
}
/* This is almost certainly wrong but it's what dma-ip32.c used to use */
}
/* This is almost certainly wrong but it's what dma-ip32.c used to use */
-static unsigned long plat_dma_addr_to_phys(struct device *dev,
+static
inline
unsigned long plat_dma_addr_to_phys(struct device *dev,
dma_addr_t dma_addr)
{
unsigned long addr = dma_addr & RAM_OFFSET_MASK;
dma_addr_t dma_addr)
{
unsigned long addr = dma_addr & RAM_OFFSET_MASK;