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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
dma-mapping.h
diff --git
a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index
7a21d0b
..
28b7ee8
100644
(file)
--- a/
arch/arm/include/asm/dma-mapping.h
+++ b/
arch/arm/include/asm/dma-mapping.h
@@
-32,7
+32,7
@@
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
{
- return (void *)__bus_to_virt(addr);
+ return (void *)__bus_to_virt(
(unsigned long)
addr);
}
static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)