Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

[linux-2.6-omap-h63xx.git] / include / linux / cgroup_subsys.h

diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 0b9bfbde81686cc1ef6854ce429672ef5b85855c..9c22396e8b50355e3058e93807f293112622079f 100644 (file)
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -13,26 +13,44 @@ SUBSYS(cpuset)
 
 /* */
 
+#ifdef CONFIG_CGROUP_DEBUG
+SUBSYS(debug)
+#endif
+
+/* */
+
+#ifdef CONFIG_CGROUP_NS
+SUBSYS(ns)
+#endif
+
+/* */
+
+#ifdef CONFIG_CGROUP_SCHED
+SUBSYS(cpu_cgroup)
+#endif
+
+/* */
+
 #ifdef CONFIG_CGROUP_CPUACCT
 SUBSYS(cpuacct)
 #endif
 
 /* */
 
-#ifdef CONFIG_CGROUP_DEBUG
-SUBSYS(debug)
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+SUBSYS(mem_cgroup)
 #endif
 
 /* */
 
-#ifdef CONFIG_CGROUP_NS
-SUBSYS(ns)
+#ifdef CONFIG_CGROUP_DEVICE
+SUBSYS(devices)
 #endif
 
 /* */
 
-#ifdef CONFIG_FAIR_CGROUP_SCHED
-SUBSYS(cpu_cgroup)
+#ifdef CONFIG_CGROUP_FREEZER
+SUBSYS(freezer)
 #endif
 
 /* */