Merge branch 'master' into for-next

[pandora-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index be788c0..3da09da 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -728,9 +728,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.