Merge tag 'master-2013-09-09' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[~andy/linux] / arch / x86 / mm / Makefile

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 3d11327c9ab4630cd0aa687dcf7118bc3efb4d25..23d8e5fecf76ba654c3cc2fd8f9b3d3efdfa193d 100644 (file)
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -27,6 +27,4 @@ obj-$(CONFIG_AMD_NUMA)                += amdtopology.o
 obj-$(CONFIG_ACPI_NUMA)                += srat.o
 obj-$(CONFIG_NUMA_EMU)         += numa_emulation.o
 
-obj-$(CONFIG_HAVE_MEMBLOCK)            += memblock.o
-
 obj-$(CONFIG_MEMTEST)          += memtest.o