Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap34xx.dtsi

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index c0dcc75..8b84513 100644 (file)
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -24,7 +24,6 @@
                };
        };
 
-       /* see Documentation/devicetree/bindings/opp/opp.txt */
        cpu0_opp_table: opp-table {
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_conf>;
@@ -183,7 +182,7 @@
 };
 
 &ssi {
-       status = "ok";
+       status = "okay";
 
        clocks = <&ssi_ssr_fck>,
                 <&ssi_sst_fck>,