aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig4
-rw-r--r--init/main.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d2b4e33d66ba..ce737e02c5a2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -443,8 +443,8 @@ config OBSOLETE_MODPARM
443 If unsure, say Y. 443 If unsure, say Y.
444 444
445config MODVERSIONS 445config MODVERSIONS
446 bool "Module versioning support (EXPERIMENTAL)" 446 bool "Module versioning support"
447 depends on MODULES && EXPERIMENTAL 447 depends on MODULES
448 help 448 help
449 Usually, you have to use modules compiled with your kernel. 449 Usually, you have to use modules compiled with your kernel.
450 Saying Y here makes it sometimes possible to use modules 450 Saying Y here makes it sometimes possible to use modules
diff --git a/init/main.c b/init/main.c
index 27f97f9b4636..54aaf561cf66 100644
--- a/init/main.c
+++ b/init/main.c
@@ -47,7 +47,6 @@
47#include <linux/rmap.h> 47#include <linux/rmap.h>
48#include <linux/mempolicy.h> 48#include <linux/mempolicy.h>
49#include <linux/key.h> 49#include <linux/key.h>
50#include <net/sock.h>
51 50
52#include <asm/io.h> 51#include <asm/io.h>
53#include <asm/bugs.h> 52#include <asm/bugs.h>
@@ -614,9 +613,6 @@ static void __init do_basic_setup(void)
614 sysctl_init(); 613 sysctl_init();
615#endif 614#endif
616 615
617 /* Networking initialization needs a process context */
618 sock_init();
619
620 do_initcalls(); 616 do_initcalls();
621} 617}
622 618