[PATCH] add a proper prototype for setup_arch()

This patch adds a proper prototype for setup_arch() in init.h.

This patch is based on a patch by Ben Dooks <ben-linux@fluff.org>.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/init.h b/include/linux/init.h
index ff8d8b8632f49bf8a8e3825ba1f3535a7ca41b4e..ed0ac7c39fdc49bc83c9db2dc885d1ec63046873 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -69,6 +69,10 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[];
 
 /* Defined in init/main.c */
 extern char saved_command_line[];
+
+/* used by init/main.c */
+extern void setup_arch(char **);
+
 #endif
   
 #ifndef MODULE

diff --git a/init/main.c b/init/main.c
index a596cb8ac98273a4bf737e5f42f5a8ea7b22011a..006dcd547dc2e72bd3280ac31e746d34da1970bf 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -306,8 +306,6 @@ static int __init rdinit_setup(char *str)
 }
 __setup("rdinit=", rdinit_setup);
 
-extern void setup_arch(char **);
-
 #ifndef CONFIG_SMP
 
 #ifdef CONFIG_X86_LOCAL_APIC