diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /mm/Makefile | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
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 06ca2381fef1..da4ccf015aea 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
| @@ -25,6 +25,7 @@ obj-$(CONFIG_SHMEM) += shmem.o | |||
| 25 | obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o | 25 | obj-$(CONFIG_TMPFS_POSIX_ACL) += shmem_acl.o |
| 26 | obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o | 26 | obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o |
| 27 | obj-$(CONFIG_SLOB) += slob.o | 27 | obj-$(CONFIG_SLOB) += slob.o |
| 28 | obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o | ||
| 28 | obj-$(CONFIG_SLAB) += slab.o | 29 | obj-$(CONFIG_SLAB) += slab.o |
| 29 | obj-$(CONFIG_SLUB) += slub.o | 30 | obj-$(CONFIG_SLUB) += slub.o |
| 30 | obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o | 31 | obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o |