Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / Makefile

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 1fbb844c3d7afdc0b35723d96ba6578c09584de1..2977ea37791f3ca3ec53efb8a2984fc17d866d30 100644 (file)
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,6 +1,7 @@
 obj-y  :=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
            pat.o pgtable.o
 
+obj-$(CONFIG_HAVE_GET_USER_PAGES_FAST) += gup.o
 obj-$(CONFIG_X86_32)           += pgtable_32.o
 
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o