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

[linux-2.6-block.git] / arch / arm / boot / dts / r8a7790-lager.dts

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 2a191b56c9f9257866ba7691b3963281ae7f9889..0c3b6783b72add5d05001c35f39d1da6e55f141b 100644 (file)
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -47,12 +47,12 @@
        compatible = "renesas,lager", "renesas,r8a7790";
 
        aliases {
-               serial6 = &scifa0;
-               serial7 = &scifa1;
+               serial0 = &scifa0;
+               serial1 = &scifa1;
        };
 
        chosen {
-               bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+               bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
                stdout-path = &scifa0;
        };