Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

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

diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
index e219849b21cac82069881fc6101cb8554bbfa685..39170f372599b2a95f5ce23db7a33967387f8ea7 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
@@ -81,5 +81,4 @@ pmm: pin-controller@1462000 {
 &vga {
        pinctrl-names = "default";
        pinctrl-0 = <&vga_pins>;
-       status = "okay";
 };