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

[deliverable/linux.git] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index fc71cf071fb2c168b035079d3ba9df07d714085a..421bef9c4c48d26c035792716064e9f273253c6e 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -23,7 +23,6 @@ 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,20 +34,11 @@ config IOSCHED_CFQ
 
 config CFQ_GROUP_IOSCHED
        bool "CFQ Group Scheduling support"
-       depends on IOSCHED_CFQ && CGROUPS
+       depends on IOSCHED_CFQ && BLK_CGROUP
        default n
        ---help---
          Enable group IO scheduling in CFQ.
 
-config DEBUG_CFQ_IOSCHED
-       bool "Debug CFQ Scheduling"
-       depends on CFQ_GROUP_IOSCHED
-       select DEBUG_BLK_CGROUP
-       default n
-       ---help---
-         Enable CFQ IO scheduling debugging in CFQ. Currently it makes
-         blktrace output more verbose.
-
 choice
        prompt "Default I/O scheduler"
        default DEFAULT_CFQ