Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6-omap-h63xx.git] / include / linux / init.h

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