Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-xp-openblocks-ax3-4.dts

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 0c76d9f05fd0c2e006df84f3fe7671a8ed29b52b..e3b08fb959e5f8ffc27977fa85d05c70a4d60792 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -54,7 +54,7 @@
        compatible = "plathome,openblocks-ax3-4", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp";
 
        chosen {
-               bootargs = "console=ttyS0,115200 earlyprintk";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {