summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 16:37:35 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 16:37:35 -0800
commit2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (patch)
treef12c2f6ce3c6a541f5192aa5a2da400024015fb7 /init
parent12f981f9028da2402c236544c78b8378a278f830 (diff)
parent3634634edd49c115da931998b9540bcc17665b05 (diff)
downloadop-kernel-dev-2c6f2db13a2428aa16f54f50232a589ddd5d7d01.zip
op-kernel-dev-2c6f2db13a2428aa16f54f50232a589ddd5d7d01.tar.gz
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 442850b..074ac97 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -382,9 +382,13 @@ config CGROUP_MEM_RES_CTLR
sure you need the memory resource controller.
config SYSFS_DEPRECATED
+ bool
+
+config SYSFS_DEPRECATED_V2
bool "Create deprecated sysfs files"
depends on SYSFS
default y
+ select SYSFS_DEPRECATED
help
This option creates deprecated symlinks such as the
"device"-link, the <subsystem>:<name>-link, and the
@@ -397,10 +401,11 @@ config SYSFS_DEPRECATED
If enabled, this option will also move any device structures
that belong to a class, back into the /sys/class hierarchy, in
- order to support older versions of udev.
+ order to support older versions of udev and some userspace
+ programs.
- If you are using a distro that was released in 2006 or later,
- it should be safe to say N here.
+ If you are using a distro with the most recent userspace
+ packages, it should be safe to say N here.
config PROC_PID_CPUSET
bool "Include legacy /proc/<pid>/cpuset file"
OpenPOWER on IntegriCloud