commit 00f0b8259e48979c37212995d798f3fbd0374690
author Balbir Singh <balbir@linux.vnet.ibm.com> Tue Mar 04 14:28:39 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Mar 04 16:35:12 2008 -0800
tree 589e8250c016450324e0c730139d020cf2bf887c
parent 804defea1c020d5c52985685e56986f1a399acde

Memory controller: rename to Memory Resource Controller

Rename Memory Controller to Memory Resource Controller.  Reflect the same
changes in the CONFIG definition for the Memory Resource Controller.  Group
together the config options for Resource Counters and Memory Resource
Controller.

Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

include/linux/cgroup_subsys.h

diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index ac6aad9..1ddebfc 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -37,7 +37,7 @@
 
 /* */
 
-#ifdef CONFIG_CGROUP_MEM_CONT
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
 SUBSYS(mem_cgroup)
 #endif