X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=mm%2FMakefile;h=a5b0dd93427a7266d7a26dcc7fd1266c602725fb;hb=2513926c286ca1d0d189c206966011bdd4080354;hp=9f117bab5322e59b49cba45146b0e54176d206ca;hpb=6e5565f949af1322f8f3d3f43d044645ae448499;p=sfrench%2Fcifs-2.6.git

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