X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Ftile%2Fconfigs%2Ftilepro_defconfig;fp=arch%2Ftile%2Fconfigs%2Ftilepro_defconfig;h=c11de27a9bcb232061be13744514589282ef68ed;hb=c255a458055e459f65eb7b7f51dc5dbdd0caf1d8;hp=2b1fd31894f10329065334a1c30cdbfaf8ac4f24;hpb=80934513b230bfcf70265f2ef0fdae89fb391633;p=~andy%2Flinux

diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 2b1fd31894f..c11de27a9bc 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -17,8 +17,8 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y