aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2005-01-09 19:28:21 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2005-01-09 19:28:21 -0800
commitcb7d9f1d9a6a0c9291afc713ab7d0920cf7f88a6 (patch)
treed2e8843ef3dfc60ab65f7e674100fae35ef6bd83 /init
parentcf4a33ef7ef44ef97446527317254783d5f448de (diff)
parent960940e00f79a7672c92d32ac47198f0bb825a9a (diff)
downloadhistory-cb7d9f1d9a6a0c9291afc713ab7d0920cf7f88a6.tar.gz
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig17
1 files changed, 3 insertions, 14 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 897465c6f28063..67a5f78dec2187 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -195,20 +195,9 @@ config HOTPLUG
bool "Support for hot-pluggable devices" if !ARCH_S390
default ARCH_S390
help
- Say Y here if you want to plug devices into your computer while
- the system is running, and be able to use them quickly. In many
- cases, the devices can likewise be unplugged at any time too.
-
- One well known example of this is PCMCIA- or PC-cards, credit-card
- size devices such as network cards, modems or hard drives which are
- plugged into slots found on all modern laptop computers. Another
- example, used on modern desktops as well as laptops, is USB.
-
- Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
- software (at <http://linux-hotplug.sourceforge.net/>) and install it.
- Then your kernel will automatically call out to a user mode "policy
- agent" (/sbin/hotplug) to load modules and set up software needed
- to use devices as you hotplug them.
+ 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 KOBJECT_UEVENT
bool "Kernel Userspace Events"