projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/ux500' into asoc-linus
[linux-2.6-block.git]
/
drivers
/
iommu
/
shmobile-iommu.c
diff --git
a/drivers/iommu/shmobile-iommu.c
b/drivers/iommu/shmobile-iommu.c
index b6e8b57cf0a8f0f166645cbf4143d3fa01c55a30..d572863dfccd47d767aed86cfe9a04e155c0233a 100644
(file)
--- a/
drivers/iommu/shmobile-iommu.c
+++ b/
drivers/iommu/shmobile-iommu.c
@@
-296,7
+296,7
@@
done:
}
static phys_addr_t shmobile_iommu_iova_to_phys(struct iommu_domain *domain,
-
unsigned long
iova)
+
dma_addr_t
iova)
{
struct shmobile_iommu_domain *sh_domain = domain->priv;
uint32_t l1entry = 0, l2entry = 0;