diff options
| author | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /mm/Makefile | |
| parent | selinux: recognize netlink messages for 'ip addrlabel' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.xz linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.zip | |
Merge branch 'master' into next
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/Makefile b/mm/Makefile index da4ccf015aea..c06b45a1ff5f 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -33,5 +33,4 @@ 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_RES_CTLR) += memcontrol.o - +obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o |