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

[deliverable/linux.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index e20fbde0875c6154fc8deaa96df64844f67c4bfc..62a5921321cd4e379223bc9fba4242a5dba488b6 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -78,7 +78,7 @@ config BLK_DEV_INTEGRITY
        Protection.  If in doubt, say N.
 
 config BLK_CGROUP
-       bool
+       tristate
        depends on CGROUPS
        default n
        ---help---