diff --git a/[refs] b/[refs]
index 6ec504f4faea..6d4417ade044 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2eecb91522686edf8199947b77f435a4031d92f
+refs/heads/master: 237e5bc4e51813e9d8ba9da0f63e7acc608882d7
diff --git a/trunk/block/Kconfig.iosched b/trunk/block/Kconfig.iosched
index b71abfb0d726..5368d74207e8 100644
--- a/trunk/block/Kconfig.iosched
+++ b/trunk/block/Kconfig.iosched
@@ -34,7 +34,7 @@ config IOSCHED_CFQ
 
 config CFQ_GROUP_IOSCHED
 	bool "CFQ Group Scheduling support"
-	depends on IOSCHED_CFQ && CGROUPS
+	depends on IOSCHED_CFQ=y && CGROUPS
 	select BLK_CGROUP
 	default n
 	---help---