diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-15 08:19:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-15 08:19:58 -0700 |
| commit | b07175dc41babfec057f494d22a750af755297d8 (patch) | |
| tree | a25e766b9e40e1c9f080c437a34a5b5f4c60b5ae /Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml | |
| parent | 341323fa0eed1b201130b7af84d40fa04725c832 (diff) | |
| parent | 5f0b06da5cde3f0a613308b89f0afea678559fdf (diff) | |
Merge tag 'devicetree-fixes-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
"Another round of 'allOf' removals and whitespace clean-ups of schemas"
* tag 'devicetree-fixes-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: Remove more cases of 'allOf' containing a '$ref'
dt-bindings: Whitespace clean-ups in schema files
Diffstat (limited to 'Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml b/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml index 8707df613f6c..6a56214c6cfd 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml @@ -20,8 +20,8 @@ properties: oneOf: - const: allwinner,sun8i-h3-deinterlace - items: - - const: allwinner,sun50i-a64-deinterlace - - const: allwinner,sun8i-h3-deinterlace + - const: allwinner,sun50i-a64-deinterlace + - const: allwinner,sun8i-h3-deinterlace reg: maxItems: 1 |