diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 09:17:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 09:17:05 -0700 |
| commit | a12e4d304ce701844c639541d90df86e165d03f9 (patch) | |
| tree | 6ad7314b63a3303d9aa36f1c7eeb68abf64d3592 /mm/Makefile | |
| parent | 89af571ca633ada14d17746519a179553a732d31 (diff) | |
| parent | 500b067c5e6ceea49cf280a02597b1169320e08c (diff) | |
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
* 'writeback' of git://git.kernel.dk/linux-2.6-block:
writeback: check for registered bdi in flusher add and inode dirty
writeback: add name to backing_dev_info
writeback: add some debug inode list counters to bdi stats
writeback: get rid of pdflush completely
writeback: switch to per-bdi threads for flushing data
writeback: move dirty inodes from super_block to backing_dev_info
writeback: get rid of generic_sync_sb_inodes() export
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile index 5e0bd642669..147a7a7873c 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -8,7 +8,7 @@ mmu-$(CONFIG_MMU) := fremap.o highmem.o madvise.o memory.o mincore.o \ vmalloc.o obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ - maccess.o page_alloc.o page-writeback.o pdflush.o \ + maccess.o page_alloc.o page-writeback.o \ readahead.o swap.o truncate.o vmscan.o shmem.o \ prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ page_isolation.o mm_init.o $(mmu-y) |