diff --git a/[refs] b/[refs]
index 6e8d5a7d5cd6..0c95f990903d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ead6e012e2b2ab31851c288e0dd7872884a8a3
+refs/heads/master: 46595390e97b3ab2741a36f5ff69e8f6033fa9c0
diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h
index dbbdbd1bec77..8bc32bb2fce2 100644
--- a/trunk/include/linux/init.h
+++ b/trunk/include/linux/init.h
@@ -77,7 +77,8 @@ extern char *saved_command_line;
 extern unsigned int reset_devices;
 
 /* used by init/main.c */
-extern void setup_arch(char **);
+void setup_arch(char **);
+void prepare_namespace(void);
 
 #endif
   
diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c
index dc1ec0803ef9..3f57ed4599d6 100644
--- a/trunk/init/do_mounts.c
+++ b/trunk/init/do_mounts.c
@@ -9,6 +9,7 @@
 #include <linux/delay.h>
 #include <linux/mount.h>
 #include <linux/device.h>
+#include <linux/init.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 0e22f40487bb..949c27b59d12 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -94,7 +94,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void prepare_namespace(void);
 #ifdef	CONFIG_ACPI
 extern void acpi_early_init(void);
 #else