git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
iommu
/
qcom,iommu.txt
diff --git
a/Documentation/devicetree/bindings/iommu/qcom,iommu.txt
b/Documentation/devicetree/bindings/iommu/qcom,iommu.txt
index b2641ceb2b4060bfe441c85d57ec177ca1635691..059139abce3547bda5700695b521c713b0c3a07f 100644
(file)
--- a/
Documentation/devicetree/bindings/iommu/qcom,iommu.txt
+++ b/
Documentation/devicetree/bindings/iommu/qcom,iommu.txt
@@
-115,7
+115,7
@@
to non-secure vs secure interrupt line.
iommus = <&apps_iommu 4>;
};
- gpu@
0
1c00000 {
+ gpu@1c00000 {
...
iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
};