From: Richard Weinberger <richard@nod.at>
Date: Sat, 28 Jul 2012 15:51:56 +0000 (+0200)
Subject: um: set BLK_CGROUP=y in defconfig
X-Git-Tag: v3.6-rc1~12^2~6
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2cad4c1276707ae06f40482bd91af513d23f5a6d;p=~andy%2Flinux

um: set BLK_CGROUP=y in defconfig

BLK_CGROUP=m is no longer valid.

Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/um/defconfig b/arch/um/defconfig
index 7823ab12e6a..6d07609362b 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -163,7 +163,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 # CONFIG_RT_GROUP_SCHED is not set
-CONFIG_BLK_CGROUP=m
+CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y