diff --git a/[refs] b/[refs]
index 7b77e982d7f3..1daccb316be7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e2520668970aab5a764044a298e987aafc1f63d
+refs/heads/master: 846954b0a32f4ae953e082eabd178e7a98dd2efd
diff --git a/trunk/block/Kconfig.iosched b/trunk/block/Kconfig.iosched
index 5368d74207e8..b71abfb0d726 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=y && CGROUPS
+	depends on IOSCHED_CFQ && CGROUPS
 	select BLK_CGROUP
 	default n
 	---help---