Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / m68k / dts / stmark2.dts

diff --git a/arch/m68k/dts/stmark2.dts b/arch/m68k/dts/stmark2.dts
index 3688651..ebe8580 100644 (file)
--- a/arch/m68k/dts/stmark2.dts
+++ b/arch/m68k/dts/stmark2.dts
@@ -16,7 +16,7 @@
 };
 
 &uart0 {
-       u-boot,dm-pre-reloc;
+       bootph-all;
        status = "okay";
 };