diff --git a/[refs] b/[refs]
index bc54cc7ac340..947e6b6e5742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca4437d4a58147aa975f3b4ad8f6cb35dfa43bdc
+refs/heads/master: 36ea1d57a4bb7d033b5f99f13c08f9af56cd70d7
diff --git a/trunk/arch/mips/kernel/early_printk.c b/trunk/arch/mips/kernel/early_printk.c
index 818d7c350a2b..9dccfa4752b2 100644
--- a/trunk/arch/mips/kernel/early_printk.c
+++ b/trunk/arch/mips/kernel/early_printk.c
@@ -30,7 +30,13 @@ static struct console early_console __initdata = {
 	.index	= -1
 };
 
+static int early_console_initialized __initdata;
+
 void __init setup_early_printk(void)
 {
+	if (early_console_initialized)
+		return;
+	early_console_initialized = 1;
+
 	register_console(&early_console);
 }