2 files changed, 14 insertions, 17 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 11930fbb1e02..aa29b797ca2b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -206,7 +206,7 @@ config HOTPLUG
           outside the kernel tree does. Such modules require Y here.
 
 config KOBJECT_UEVENT
-        bool "Kernel Userspace Events"
+        bool "Kernel Userspace Events" if EMBEDDED
         depends on NET
         default y
         help
@@ -256,6 +256,19 @@ config CPUSETS
 
 source "usr/Kconfig"
 
+config CC_OPTIMIZE_FOR_SIZE
+        bool "Optimize for size (Look out for broken compilers!)"
+        default y
+        depends on ARM || H8300 || EXPERIMENTAL
+        help
+          Enabling this option will pass "-Os" instead of "-O2" to gcc
+          resulting in a smaller kernel.
+
+          WARNING: some versions of gcc may generate incorrect code with this
+          option.  If problems are observed, a gcc upgrade may be needed.
+
+          If unsure, say N.
+
 menuconfig EMBEDDED
         bool "Configure standard kernel features (for small systems)"
         help
@@ -338,18 +351,6 @@ config EPOLL
           Disabling this option will cause the kernel to be built without
           support for epoll family of system calls.
 
-config CC_OPTIMIZE_FOR_SIZE
-        bool "Optimize for size" if EMBEDDED
-        default y if ARM || H8300
-        help
-          Enabling this option will pass "-Os" instead of "-O2" to gcc
-          resulting in a smaller kernel.
-
-          WARNING: some versions of gcc may generate incorrect code with this
-          option.  If problems are observed, a gcc upgrade may be needed.
-
-          If unsure, say N.
-
 config SHMEM
         bool "Use full shmem filesystem" if EMBEDDED
         default y
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 @@
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
 #include <linux/key.h>
-#include <net/sock.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -614,9 +613,6 @@ static void __init do_basic_setup(void)
         sysctl_init();
 #endif
 
-        /* Networking initialization needs a process context */ 
-        sock_init();
-
         do_initcalls();
 }