Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / pinctrl / oxnas,pinctrl.txt

diff --git a/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt
index 09e81a95bbfd34a48b381830b34b8cfa154dba3c..b1159434f593285b3299fb0ee0b38486078e6b4c 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt
@@ -50,7 +50,6 @@ uart2: serial@900000 {
        reg-io-width = <1>;
        current-speed = <115200>;
        no-loopback-test;
-       status = "disabled";
        resets = <&reset 22>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart2>;