diff --git a/[refs] b/[refs] index 35cbc9e11b98..dbbb5bf170b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90ac8f7741be4ff66de1f52904f4f67f272f74ce +refs/heads/master: 83bab9a4bbf91af93f45233dc288c4d26308e281 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index ea097e0a9c02..59344616f477 100644 --- a/trunk/init/Kconfig +++ b/trunk/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