Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / i2c / i2c-demux-pinctrl.txt

diff --git a/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt b/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
index 7ce23ac6130808da6a7f621f1991b13f17f185d6..81b5d55086fa60a0118047ee9bec880c9cc8250a 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
@@ -102,7 +102,6 @@ And for clarification, here are the snipplets for the i2c-parents:
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "i2c-gpio";
-               status = "disabled";
                gpios = <&gpio5 6 GPIO_ACTIVE_HIGH /* sda */
                         &gpio5 5 GPIO_ACTIVE_HIGH /* scl */
                        >;