tunnels: fix netns vs proto registration ordering

[safe/jmp/linux-2.6] / init / version.c

diff --git a/init/version.c b/init/version.c
index 6c01ec1..adff586 100644 (file)
--- a/init/version.c
+++ b/init/version.c
@@ -6,18 +6,20 @@
  *  May be freely distributed as part of Linux.
  */
 
-#include <linux/compile.h>
+#include <generated/compile.h>
 #include <linux/module.h>
 #include <linux/uts.h>
 #include <linux/utsname.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/version.h>
-#include <linux/sched.h>
 
+#ifndef CONFIG_KALLSYMS
 #define version(a) Version_ ## a
 #define version_string(a) version(a)
 
+extern int version_string(LINUX_VERSION_CODE);
 int version_string(LINUX_VERSION_CODE);
+#endif
 
 struct uts_namespace init_uts_ns = {
        .kref = {