Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[sfrench/cifs-2.6.git] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index b71abfb0d7269eed44b65b3e75b8c6aa3b1ebbe5..fc71cf071fb2c168b035079d3ba9df07d714085a 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -23,6 +23,7 @@ config IOSCHED_DEADLINE
 
 config IOSCHED_CFQ
        tristate "CFQ I/O scheduler"
+       select BLK_CGROUP if CFQ_GROUP_IOSCHED
        default y
        ---help---
          The CFQ I/O scheduler tries to distribute bandwidth equally
@@ -35,7 +36,6 @@ config IOSCHED_CFQ
 config CFQ_GROUP_IOSCHED
        bool "CFQ Group Scheduling support"
        depends on IOSCHED_CFQ && CGROUPS
-       select BLK_CGROUP
        default n
        ---help---
          Enable group IO scheduling in CFQ.