aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 21:44:12 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 21:44:12 -0500
commitdb9edfd7e339ca4113153d887e782dd05be5a9eb (patch)
tree0a4ba12447a0cabc800adc7e9667d284777b0181 /init
parent631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff)
parentfd586bacf439f36dea9b9bf6e6133ac87df2730c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig36
1 files changed, 9 insertions, 27 deletions
diff --git a/init/Kconfig b/init/Kconfig
index aa29b797ca2b..ce737e02c5a2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -197,33 +197,6 @@ config AUDITSYSCALL
197 can be used independently or with another kernel subsystem, 197 can be used independently or with another kernel subsystem,
198 such as SELinux. 198 such as SELinux.
199 199
200config HOTPLUG
201 bool "Support for hot-pluggable devices" if !ARCH_S390
202 default ARCH_S390
203 help
204 This option is provided for the case where no in-kernel-tree
205 modules require HOTPLUG functionality, but a module built
206 outside the kernel tree does. Such modules require Y here.
207
208config KOBJECT_UEVENT
209 bool "Kernel Userspace Events" if EMBEDDED
210 depends on NET
211 default y
212 help
213 This option enables the kernel userspace event layer, which is a
214 simple mechanism for kernel-to-user communication over a netlink
215 socket.
216 The goal of the kernel userspace events layer is to provide a simple
217 and efficient events system, that notifies userspace about kobject
218 state changes. This will enable applications to just listen for
219 events instead of polling system devices and files.
220 Hotplug events (kobject addition and removal) are also available on
221 the netlink socket in addition to the execution of /sbin/hotplug if
222 CONFIG_HOTPLUG is enabled.
223
224 Say Y, unless you are building a system requiring minimal memory
225 consumption.
226
227config IKCONFIG 200config IKCONFIG
228 bool "Kernel .config support" 201 bool "Kernel .config support"
229 ---help--- 202 ---help---
@@ -308,6 +281,15 @@ config KALLSYMS_EXTRA_PASS
308 you wait for kallsyms to be fixed. 281 you wait for kallsyms to be fixed.
309 282
310 283
284config HOTPLUG
285 bool "Support for hot-pluggable devices" if EMBEDDED
286 default y
287 help
288 This option is provided for the case where no hotplug or uevent
289 capabilities is wanted by the kernel. You should only consider
290 disabling this option for embedded systems that do not use modules, a
291 dynamic /dev tree, or dynamic device discovery. Just say Y.
292
311config PRINTK 293config PRINTK
312 default y 294 default y
313 bool "Enable support for printk" if EMBEDDED 295 bool "Enable support for printk" if EMBEDDED