diff --git a/[refs] b/[refs] index 40d3101d9e16..b0a26e44543a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f348d70a324e15afc701a494f32ec468abb7d1eb +refs/heads/master: 77d47582c2345e071df02afaf9191641009287c4 diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h index ff8d8b8632f4..ed0ac7c39fdc 100644 --- a/trunk/include/linux/init.h +++ b/trunk/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/trunk/init/main.c b/trunk/init/main.c index a596cb8ac982..006dcd547dc2 100644 --- a/trunk/init/main.c +++ b/trunk/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