aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 19:37:35 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 19:37:35 -0500
commit2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (patch)
treef12c2f6ce3c6a541f5192aa5a2da400024015fb7 /init
parent12f981f9028da2402c236544c78b8378a278f830 (diff)
parent3634634edd49c115da931998b9540bcc17665b05 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: debugfs: fix sparse warnings Driver core: Fix cleanup when failing device_add(). driver core: Remove dpm_sysfs_remove() from error path of device_add() PM: fix new mutex-locking bug in the PM core PM: Do not acquire device semaphores upfront during suspend kobject: properly initialize ksets sysfs: CONFIG_SYSFS_DEPRECATED fix driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig11
1 files changed, 8 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 442850b984be..074ac97f55e3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -382,9 +382,13 @@ config CGROUP_MEM_RES_CTLR
382 sure you need the memory resource controller. 382 sure you need the memory resource controller.
383 383
384config SYSFS_DEPRECATED 384config SYSFS_DEPRECATED
385 bool
386
387config SYSFS_DEPRECATED_V2
385 bool "Create deprecated sysfs files" 388 bool "Create deprecated sysfs files"
386 depends on SYSFS 389 depends on SYSFS
387 default y 390 default y
391 select SYSFS_DEPRECATED
388 help 392 help
389 This option creates deprecated symlinks such as the 393 This option creates deprecated symlinks such as the
390 "device"-link, the <subsystem>:<name>-link, and the 394 "device"-link, the <subsystem>:<name>-link, and the
@@ -397,10 +401,11 @@ config SYSFS_DEPRECATED
397 401
398 If enabled, this option will also move any device structures 402 If enabled, this option will also move any device structures
399 that belong to a class, back into the /sys/class hierarchy, in 403 that belong to a class, back into the /sys/class hierarchy, in
400 order to support older versions of udev. 404 order to support older versions of udev and some userspace
405 programs.
401 406
402 If you are using a distro that was released in 2006 or later, 407 If you are using a distro with the most recent userspace
403 it should be safe to say N here. 408 packages, it should be safe to say N here.
404 409
405config PROC_PID_CPUSET 410config PROC_PID_CPUSET
406 bool "Include legacy /proc/<pid>/cpuset file" 411 bool "Include legacy /proc/<pid>/cpuset file"