X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fcgroup_subsys.h;h=1ddebfc52565f3eb4894c422c1fc5dd831ae523c;hb=95d8c365b2df2adb904963333a93b15414403ed1;hp=9ec43186ba80b840a3e2c4104739201990e7d772;hpb=c8b1ef88d09961078d3c685fcdc1d1659db05231;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 9ec43186ba8..1ddebfc5256 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -25,7 +25,7 @@ SUBSYS(ns)
 
 /* */
 
-#ifdef CONFIG_FAIR_CGROUP_SCHED
+#ifdef CONFIG_CGROUP_SCHED
 SUBSYS(cpu_cgroup)
 #endif
 
@@ -37,3 +37,8 @@ SUBSYS(cpuacct)
 
 /* */
 
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+SUBSYS(mem_cgroup)
+#endif
+
+/* */