Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5721d27..56240e7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -69,11 +69,6 @@ config BROKEN_ON_SMP
        depends on BROKEN || !SMP
        default y
 
-config LOCK_KERNEL
-       bool
-       depends on (SMP || PREEMPT) && BKL
-       default y
-
 config INIT_ENV_ARG_LIMIT
        int
        default 32 if !UML
@@ -750,9 +745,9 @@ config BLK_CGROUP
 
        This option only enables generic Block IO controller infrastructure.
        One needs to also enable actual IO controlling logic/policy. For
-       enabling proportional weight division of disk bandwidth in CFQ seti
-       CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set
-       CONFIG_BLK_THROTTLE=y.
+       enabling proportional weight division of disk bandwidth in CFQ, set
+       CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+       CONFIG_BLK_DEV_THROTTLING=y.
 
        See Documentation/cgroups/blkio-controller.txt for more information.
 
@@ -836,7 +831,7 @@ config MM_OWNER
        bool
 
 config SYSFS_DEPRECATED
-       bool "enable deprecated sysfs features to support old userspace tools"
+       bool "Enable deprecated sysfs features to support old userspace tools"
        depends on SYSFS
        default n
        help
@@ -859,7 +854,7 @@ config SYSFS_DEPRECATED
          need to say Y here.
 
 config SYSFS_DEPRECATED_V2
-       bool "enabled deprecated sysfs features by default"
+       bool "Enable deprecated sysfs features by default"
        default n
        depends on SYSFS
        depends on SYSFS_DEPRECATED