summaryrefslogtreecommitdiff
path: root/mm/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-08-25 14:17:45 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-08-25 14:17:45 +1000
commita8cb9983c6566f87d5726880e2b70bc4cf9025ec (patch)
tree4218120570230a3ee03cd22f93af08be08b3b0bb /mm/Makefile
parentc7fa5bfd3e6518947b8b33fa53aaedc6bf9f4b7e (diff)
parentaccdd235315a2098541c702e78a0c1899f62a688 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'mm/Makefile')
-rw-r--r--mm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile
index 632ae77e6070..a96e3a1dea1f 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -3,7 +3,7 @@
#
mmu-y := nommu.o
-mmu-$(CONFIG_MMU) := fremap.o gup.o highmem.o madvise.o memory.o mincore.o \
+mmu-$(CONFIG_MMU) := gup.o highmem.o madvise.o memory.o mincore.o \
mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
vmalloc.o pagewalk.o pgtable-generic.o