projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/fix/atmel' into spi-linus
[cascardo/linux.git]
/
drivers
/
iommu
/
msm_iommu.c
diff --git
a/drivers/iommu/msm_iommu.c
b/drivers/iommu/msm_iommu.c
index
6a8870a
..
8ab4f41
100644
(file)
--- a/
drivers/iommu/msm_iommu.c
+++ b/
drivers/iommu/msm_iommu.c
@@
-554,7
+554,7
@@
fail:
}
static phys_addr_t msm_iommu_iova_to_phys(struct iommu_domain *domain,
-
unsigned long
va)
+
dma_addr_t
va)
{
struct msm_priv *priv;
struct msm_iommu_drvdata *iommu_drvdata;