Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 72f33faca44fbef6734cdce724090c917ccf52b9..2acd917ebf2d1a1e4ce48ed288583d164a9dbfdf 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -757,7 +757,7 @@ config RT_GROUP_SCHED
 endif #CGROUP_SCHED
 
 config BLK_CGROUP
-       tristate "Block IO controller"
+       bool "Block IO controller"
        depends on BLOCK
        default n
        ---help---