aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/video/analog-tv-connector.txt
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 11:34:07 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 11:34:07 -0700
commit9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch)
treebcf7334c0e57323a6844b8147ce1c92180fe8cef /Documentation/devicetree/bindings/video/analog-tv-connector.txt
parentInput: Add Microchip AR1021 i2c touchscreen (diff)
parentLinux 3.17 (diff)
downloadlinux-dev-9d93551188069a0a21e664b4bfc89ed4a6df1903.tar.xz
linux-dev-9d93551188069a0a21e664b4bfc89ed4a6df1903.zip
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042 drivers.
Diffstat (limited to 'Documentation/devicetree/bindings/video/analog-tv-connector.txt')
-rw-r--r--Documentation/devicetree/bindings/video/analog-tv-connector.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/video/analog-tv-connector.txt b/Documentation/devicetree/bindings/video/analog-tv-connector.txt
index 0218fcdc1299..0c0970c210ab 100644
--- a/Documentation/devicetree/bindings/video/analog-tv-connector.txt
+++ b/Documentation/devicetree/bindings/video/analog-tv-connector.txt
@@ -2,7 +2,7 @@ Analog TV Connector
===================
Required properties:
-- compatible: "composite-connector" or "svideo-connector"
+- compatible: "composite-video-connector" or "svideo-connector"
Optional properties:
- label: a symbolic name for the connector
@@ -14,7 +14,7 @@ Example
-------
tv: connector {
- compatible = "composite-connector";
+ compatible = "composite-video-connector";
label = "tv";
port {