aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2012-07-28 11:51:56 -0400
committerRichard Weinberger <richard@nod.at>2012-07-28 11:51:56 -0400
commit2cad4c1276707ae06f40482bd91af513d23f5a6d (patch)
tree7f33409a264f2067de42f805e8afb34f642260fa /arch/um
parenta84ccab132370a07c7ca0c6df8c96bbd16306c9a (diff)
um: set BLK_CGROUP=y in defconfig
BLK_CGROUP=m is no longer valid. Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig
index 7823ab12e6a4..6d07609362bd 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -163,7 +163,7 @@ CONFIG_CGROUP_SCHED=y
163CONFIG_FAIR_GROUP_SCHED=y 163CONFIG_FAIR_GROUP_SCHED=y
164# CONFIG_CFS_BANDWIDTH is not set 164# CONFIG_CFS_BANDWIDTH is not set
165# CONFIG_RT_GROUP_SCHED is not set 165# CONFIG_RT_GROUP_SCHED is not set
166CONFIG_BLK_CGROUP=m 166CONFIG_BLK_CGROUP=y
167# CONFIG_DEBUG_BLK_CGROUP is not set 167# CONFIG_DEBUG_BLK_CGROUP is not set
168# CONFIG_CHECKPOINT_RESTORE is not set 168# CONFIG_CHECKPOINT_RESTORE is not set
169CONFIG_NAMESPACES=y 169CONFIG_NAMESPACES=y