Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

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

diff --git a/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt b/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
index aead5869a28d9cbd71846caf6e94e7844adb9153..b849a1ed389d55df9662ca5708f8b93424b9ce88 100644 (file)
--- a/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
+++ b/Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
@@ -62,7 +62,6 @@ uart1: serial@4806a000 {
        interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
        ti,hwmods = "uart1";
        clock-frequency = <48000000>;
-       status = "disabled";
        /* Requesting crossbar input 49 and 50 */
        dmas = <&sdma_xbar 49>, <&sdma_xbar 50>;
        dma-names = "tx", "rx";