X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2FKconfig.iosched;h=421bef9c4c48d26c035792716064e9f273253c6e;hb=af211211e39f59575854d5976a4e301c8c21d4bc;hp=3199b76f795de33f9db31e140aad75a716a51d44;hpb=2a88e7e559f2358f4e1422d0b0c0278a74136581;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 3199b76f795d..421bef9c4c48 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -23,8 +23,6 @@ config IOSCHED_DEADLINE
 
 config IOSCHED_CFQ
 	tristate "CFQ I/O scheduler"
-	# If BLK_CGROUP is a module, CFQ has to be built as module.
-	depends on (BLK_CGROUP=m && m) || !BLK_CGROUP || BLK_CGROUP=y
 	default y
 	---help---
 	  The CFQ I/O scheduler tries to distribute bandwidth equally
@@ -34,8 +32,6 @@ config IOSCHED_CFQ
 
 	  This is the default I/O scheduler.
 
-	  Note: If BLK_CGROUP=m, then CFQ can be built only as module.
-
 config CFQ_GROUP_IOSCHED
 	bool "CFQ Group Scheduling support"
 	depends on IOSCHED_CFQ && BLK_CGROUP