diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 15:36:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 15:36:43 +0300 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt | |
| parent | 72f40a2823d6e16229ab58b898c6f22044e5222f (diff) | |
| parent | ab234a260b1f625b26cbefa93ca365b0ae66df33 (diff) | |
| download | linux-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.xz | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt index 736be7cad385..acfb50375b8a 100644 --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt @@ -14,7 +14,7 @@ Required properties: - power-domains: a phandle to the power domain, see Documentation/devicetree/bindings/power/power_domain.txt for details. - mediatek,larb: must contain the local arbiters in the current SoCs, see - Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml for details. - iommus: should point to the respective IOMMU block with master port as argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt |