From 1636749e52b1e7ec5baa02730e89f2be94a02d59 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 Nov 2005 11:27:07 -0800 Subject: [PATCH] --- yaml --- r: 16203 b: refs/heads/master c: 712f47cea7703a340406fde61e84eb86ce781988 h: refs/heads/master i: 16201: 35dc2ed31389cdb0539c2efe749b4abec8dbcb5a 16199: cbd5933314798ad22bbf7dded67d3d81a737397f v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 86654b100a2a..75b6d624672d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 312c004d36ce6c739512bac83b452f4c20ab1f62 +refs/heads/master: 712f47cea7703a340406fde61e84eb86ce781988 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 0de8b7765ae4..d2b4e33d66ba 100644 --- a/trunk/init/Kconfig +++ b/trunk/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