Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap3-devkit8000-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index ac3d996cec5c28756653a7d12459e48381913843..2c19d6e255bdc9c4c15cefcb4e12ecd85c2de28d 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -337,7 +337,7 @@
 };
 
 &dss {
-       status = "ok";
+       status = "okay";
 
        pinctrl-names = "default";
        pinctrl-0 = <&dss_dpi_pins>;
@@ -361,7 +361,7 @@
 };
 
 &venc {
-       status = "ok";
+       status = "okay";
 
        vdda-supply = <&vdac>;