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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stih418-b2199.dts

diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 39b4db2..cd0d719 100644 (file)
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -14,7 +14,7 @@
        compatible = "st,stih418-b2199", "st,stih418";
 
        chosen {
-               bootargs = "console=ttyAS0,115200 clk_ignore_unused";
+               bootargs = "clk_ignore_unused";
                stdout-path = &sbc_serial0;
        };
 
@@ -24,7 +24,7 @@
        };
 
        aliases {
-               ttyAS0 = &sbc_serial0;
+               serial0 = &sbc_serial0;
                ethernet0 = &ethernet0;
        };