Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / arm / boot / dts / r8a7793-gose.dts

diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index d842ce77b7c896e5f9d4881d8a7d9bafc38cd05c..baa59fe8429869ac2bd975e5e7da5a443df122d6 100644 (file)
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -24,7 +24,7 @@
 
        chosen {
                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
-               stdout-path = &scif0;
+               stdout-path = "serial0:115200n8";
        };
 
        memory@40000000 {
@@ -115,6 +115,7 @@
                m25p,fast-read;
 
                partitions {
+                       compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;