summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/display
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-05-18 14:08:53 +1000
committerDave Airlie <airlied@redhat.com>2018-05-18 14:08:53 +1000
commit1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch)
treef829e8a26fc768666eb5f827bf5817892ea7e46c /Documentation/devicetree/bindings/display
parent315852b422972e6ebb1dfddaadada09e46a2681a (diff)
parent76ef6b28ea4f81c3d511866a9b31392caa833126 (diff)
downloadblackbird-obmc-linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.gz
blackbird-obmc-linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.zip
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce the nouveau -next conflicts a lot. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'Documentation/devicetree/bindings/display')
-rw-r--r--Documentation/devicetree/bindings/display/panel/panel-common.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/panel/panel-common.txt b/Documentation/devicetree/bindings/display/panel/panel-common.txt
index 557fa765adcb..5d2519af4bb5 100644
--- a/Documentation/devicetree/bindings/display/panel/panel-common.txt
+++ b/Documentation/devicetree/bindings/display/panel/panel-common.txt
@@ -38,7 +38,7 @@ Display Timings
require specific display timings. The panel-timing subnode expresses those
timings as specified in the timing subnode section of the display timing
bindings defined in
- Documentation/devicetree/bindings/display/display-timing.txt.
+ Documentation/devicetree/bindings/display/panel/display-timing.txt.
Connectivity
OpenPOWER on IntegriCloud