diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 19:49:15 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 19:49:15 +0300 |
| commit | facbf0b9820f34f14b54f567862b4a96e910f468 (patch) | |
| tree | ee65e875e4167dd903f2745cfbf6b2735fd1cd9e /Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml | |
| parent | 19bf119ccfa071b73a54465e8082ab2c8f8c30eb (diff) | |
| parent | dcde237b9b0eb1d19306e6f48c0a4e058907619f (diff) | |
| download | linux-facbf0b9820f34f14b54f567862b4a96e910f468.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml b/Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml index 41fd5713c156..be69e0cc50fc 100644 --- a/Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml +++ b/Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml @@ -33,7 +33,7 @@ additionalProperties: false examples: - | - sysreg { + sysreg@0 { compatible = "arm,versatile-sysreg", "syscon", "simple-mfd"; reg = <0x00000 0x1000>; |