diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 15:16:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 15:16:24 +0100 |
| commit | 2ff9f9d9629bf9530fe2ab8d803d612761ffc059 (patch) | |
| tree | b22e3fddffbc0f58b1e1974f4819896d58b7bdaf /mm/Makefile | |
| parent | 0f01f07fad4ee11d98fe6faa442afbeb0328a378 (diff) | |
| parent | a4900437f3d76761a1646cd90254ccb01714a9ed (diff) | |
| download | kernel_samsung_smdk4412-2ff9f9d9629bf9530fe2ab8d803d612761ffc059.tar.gz kernel_samsung_smdk4412-2ff9f9d9629bf9530fe2ab8d803d612761ffc059.tar.bz2 kernel_samsung_smdk4412-2ff9f9d9629bf9530fe2ab8d803d612761ffc059.zip | |
Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Makefile b/mm/Makefile index c06b45a1ff5..3782eb66d4b 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -34,3 +34,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 |