[PATCH] HOTPLUG: always enable the .config option, unless EMBEDDED

With modules, dynamic /dev, and uevents, people really want
CONFIG_HOTPLUG to be enabled in their kernels.  If not, they can still
disable it, but it is discouraged.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/init/Kconfig b/init/Kconfig
index 0de8b7765ae43f237c6e88e1895df8b7db423888..d2b4e33d66ba2f582081ca420402d0562802e8e2 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -197,14 +197,6 @@ config AUDITSYSCALL
          can be used independently or with another kernel subsystem,
          such as SELinux.
 
-config HOTPLUG
-       bool "Support for hot-pluggable devices" if !ARCH_S390
-       default ARCH_S390
-       help
-         This option is provided for the case where no in-kernel-tree
-         modules require HOTPLUG functionality, but a module built
-         outside the kernel tree does. Such modules require Y here.
-
 config IKCONFIG
        bool "Kernel .config support"
        ---help---
@@ -289,6 +281,15 @@ config KALLSYMS_EXTRA_PASS
           you wait for kallsyms to be fixed.
 
 
+config HOTPLUG
+       bool "Support for hot-pluggable devices" if EMBEDDED
+       default y
+       help
+         This option is provided for the case where no hotplug or uevent
+         capabilities is wanted by the kernel.  You should only consider
+         disabling this option for embedded systems that do not use modules, a
+         dynamic /dev tree, or dynamic device discovery.  Just say Y.
+
 config PRINTK
        default y
        bool "Enable support for printk" if EMBEDDED