Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap4-duovero-parlor.dts

diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index 4548d87..b294c22 100644 (file)
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -171,11 +171,11 @@
 };
 
 &dss {
-       status = "ok";
+       status = "okay";
 };
 
 &hdmi {
-       status = "ok";
+       status = "okay";
        vdda-supply = <&vdac>;
 
        pinctrl-names = "default";