Merge tag 'iwlwifi-for-kalle-2015-01-13' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx6qdl-dfi-fs700-m60.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
index 25cf035dd36e16124bff1889fca6b488a1ca998c..2c253d6d20bd1fec6b71d18347f27ef0126e3f5e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
@@ -22,7 +22,7 @@
        };
 
        chosen {
-               linux,stdout-path = &uart1;
+               stdout-path = &uart1;
        };
 };