Merge branch 'akpm' (Andrew's patch-bomb)

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 7dca2cebec9981294dce50c7400ab9faf96fade7..d07dcf9fc8a9a8f05a570298d106c29e28f7167f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -802,7 +802,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---