Merge branch 'linus' into tracing/kmemtrace

[safe/jmp/linux-2.6] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 51c2770..c92e8af 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_MIGRATION) += migrate.o
 obj-$(CONFIG_SMP) += allocpercpu.o
 obj-$(CONFIG_QUICKLIST) += quicklist.o
 obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
+obj-$(CONFIG_KMEMTRACE) += kmemtrace.o