Merge branch 'master' into upstream-fixes

[linux-drm-fsl-dcu.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 4f2166a833b9566039f94b7f05ed712a507153a9..f3c077eb0b8ef505afe79b5c13363f45edea4aad 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -10,9 +10,10 @@ mmu-$(CONFIG_MMU)    := fremap.o highmem.o madvise.o memory.o mincore.o \
 obj-y                  := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
                           page_alloc.o page-writeback.o pdflush.o \
                           readahead.o swap.o truncate.o vmscan.o \
-                          prio_tree.o util.o mmzone.o vmstat.o $(mmu-y)
+                          prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \
+                          $(mmu-y)
 
-ifeq ($(CONFIG_MMU),y)
+ifeq ($(CONFIG_MMU)$(CONFIG_BLOCK),yy)
 obj-y                  += bounce.o
 endif
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o thrash.o