diff options
| author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-03-04 14:28:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 16:35:12 -0800 |
| commit | 00f0b8259e48979c37212995d798f3fbd0374690 (patch) | |
| tree | 589e8250c016450324e0c730139d020cf2bf887c /mm/Makefile | |
| parent | 804defea1c020d5c52985685e56986f1a399acde (diff) | |
| download | linux-stable-00f0b8259e48979c37212995d798f3fbd0374690.tar.gz linux-stable-00f0b8259e48979c37212995d798f3fbd0374690.tar.bz2 linux-stable-00f0b8259e48979c37212995d798f3fbd0374690.zip | |
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>
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile index 9f117bab5322..a5b0dd93427a 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -32,5 +32,5 @@ obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o obj-$(CONFIG_QUICKLIST) += quicklist.o -obj-$(CONFIG_CGROUP_MEM_CONT) += memcontrol.o +obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o |