Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix
[sfrench/cifs-2.6.git] / arch / x86 / mm / numa_emulation.c
index d71d72cf6c66685eb9f8eee9f7bb29c4a277baa2..abffa0be80da17b7996a578f8d22af14dfebe326 100644 (file)
@@ -6,7 +6,6 @@
 #include <linux/errno.h>
 #include <linux/topology.h>
 #include <linux/memblock.h>
-#include <linux/bootmem.h>
 #include <asm/dma.h>
 
 #include "numa_internal.h"