From d645980e66dab010ffc760dd6987bbfeb8213a07 Mon Sep 17 00:00:00 2001
From: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Date: Thu, 29 May 2008 17:57:08 +0300
Subject: [PATCH] --- yaml --- r: 101422 b: refs/heads/master c:
 07cdb78436d52416a582e645b9afb6e26f986bc9 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/kernel/early_printk.c | 2 ++
 trunk/arch/mips/kernel/setup.c        | 6 +-----
 trunk/include/asm-mips/setup.h        | 2 ++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4130d984c819..e6046dd12bc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c88a8b4ab0e1a1f06938939d9ba42e9da6144ccb
+refs/heads/master: 07cdb78436d52416a582e645b9afb6e26f986bc9
diff --git a/trunk/arch/mips/kernel/early_printk.c b/trunk/arch/mips/kernel/early_printk.c
index 9dccfa4752b2..9ae813eb782e 100644
--- a/trunk/arch/mips/kernel/early_printk.c
+++ b/trunk/arch/mips/kernel/early_printk.c
@@ -10,6 +10,8 @@
 #include <linux/console.h>
 #include <linux/init.h>
 
+#include <asm/setup.h>
+
 extern void prom_putchar(char);
 
 static void __init
diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c
index c04e4e3afede..8af84867e74d 100644
--- a/trunk/arch/mips/kernel/setup.c
+++ b/trunk/arch/mips/kernel/setup.c
@@ -550,11 +550,7 @@ void __init setup_arch(char **cmdline_p)
 	prom_init();
 
 #ifdef CONFIG_EARLY_PRINTK
-	{
-		extern void setup_early_printk(void);
-
-		setup_early_printk();
-	}
+	setup_early_printk();
 #endif
 	cpu_report();
 	check_bugs_early();
diff --git a/trunk/include/asm-mips/setup.h b/trunk/include/asm-mips/setup.h
index 70009a902639..883f59bfa097 100644
--- a/trunk/include/asm-mips/setup.h
+++ b/trunk/include/asm-mips/setup.h
@@ -3,4 +3,6 @@
 
 #define COMMAND_LINE_SIZE	256
 
+extern void setup_early_printk(void);
+
 #endif /* __SETUP_H */