Merge commit 'v3.14' into next

[firefly-linux-kernel-4.4.55.git] / Documentation / devicetree / bindings / sound / simple-card.txt

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index e9e20ec67d62b349d021099a755bbd5eca2a6b2a..19c84df5fffa35d8a65adae8f39db947da969147 100644 (file)
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -43,7 +43,7 @@ Example:
 sound {
        compatible = "simple-audio-card";
        simple-audio-card,format = "left_j";
-       simple-audio-routing =
+       simple-audio-card,routing =
                "MIC_IN", "Mic Jack",
                "Headphone Jack", "HP_OUT",
                "Ext Spk", "LINE_OUT";