aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-04-20 12:09:31 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-04-20 12:09:31 +0300
commit6b75b54c841a18ef114704aa5cf2cdf43487b0ae (patch)
tree3d2f0e1dc68d96cfd7fc7b32863b155801098544 /Documentation
parentfbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex (diff)
parentomapdss: extend pm notifier to handle hibernation (diff)
downloadlinux-dev-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.tar.xz
linux-dev-6b75b54c841a18ef114704aa5cf2cdf43487b0ae.zip
Merge omapdss topic branch for fbdev 4.1
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/video/ti,omap-dss.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/video/ti,omap-dss.txt b/Documentation/devicetree/bindings/video/ti,omap-dss.txt
index d5f1a3fe3109..e1ef29569338 100644
--- a/Documentation/devicetree/bindings/video/ti,omap-dss.txt
+++ b/Documentation/devicetree/bindings/video/ti,omap-dss.txt
@@ -25,8 +25,8 @@ Video Ports
-----------
The DSS Core and the encoders have video port outputs. The structure of the
-video ports is described in Documentation/devicetree/bindings/video/video-
-ports.txt, and the properties for the ports and endpoints for each encoder are
+video ports is described in Documentation/devicetree/bindings/graph.txt,
+and the properties for the ports and endpoints for each encoder are
described in the SoC's DSS binding documentation.
The video ports are used to describe the connections to external hardware, like