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

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / media / samsung-fimc.txt

diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt
index 922d6f8e74be37c9992655402861af59ae8ff83a..e4e15d8d752157909e03344ee04ce7621ba5b967 100644 (file)
--- a/Documentation/devicetree/bindings/media/samsung-fimc.txt
+++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt
@@ -166,7 +166,6 @@ Example:
                clock-output-names = "cam_a_clkout", "cam_b_clkout";
                pinctrl-names = "default";
                pinctrl-0 = <&cam_port_a_clk_active>;
-               status = "okay";
                #address-cells = <1>;
                #size-cells = <1>;
 
@@ -189,7 +188,6 @@ Example:
                        compatible = "samsung,exynos4210-fimc";
                        reg = <0x11800000 0x1000>;
                        interrupts = <0 85 0>;
-                       status = "okay";
                };
 
                csis_0: csis@11880000 {