Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / dma / st_fdma.txt

diff --git a/Documentation/devicetree/bindings/dma/st_fdma.txt b/Documentation/devicetree/bindings/dma/st_fdma.txt
index 495d853c569b7d2ed4d40dfc9534d8291edcd6b1..52cfec9e77ad528287f7ff18670802162d2a72cf 100644 (file)
--- a/Documentation/devicetree/bindings/dma/st_fdma.txt
+++ b/Documentation/devicetree/bindings/dma/st_fdma.txt
@@ -69,7 +69,6 @@ Example:
 
        sti_uni_player2: sti-uni-player@2 {
                compatible = "st,sti-uni-player";
-               status = "disabled";
                #sound-dai-cells = <0>;
                st,syscfg = <&syscfg_core>;
                clocks = <&clk_s_d0_flexgen CLK_PCM_2>;