diff --git a/[refs] b/[refs] index 90d6554e011d..ec40b23f80ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 542c98c06712fdbbbfe6b9e92a8d0023cf45102a +refs/heads/master: bb807e69c9eec271808cf69d19913d7ee1a51f6f diff --git a/trunk/arch/powerpc/boot/dts/prpmc2800.dts b/trunk/arch/powerpc/boot/dts/prpmc2800.dts index 568965a022b9..699d0df574d5 100644 --- a/trunk/arch/powerpc/boot/dts/prpmc2800.dts +++ b/trunk/arch/powerpc/boot/dts/prpmc2800.dts @@ -309,7 +309,7 @@ }; chosen { - bootargs = "ip=on console=ttyMM0"; + bootargs = "ip=on"; linux,stdout-path = "/mv64x60@f1000000/mpsc@8000"; }; };