aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/mm/numa.c
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2016-06-07 14:39:38 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2016-06-07 14:39:38 +0100
commit2e33635db818301308163fa6f1aba0f2a3df6db2 (patch)
tree6c794bd771189a695d92706fdd1a11b9ff7c2bc0 /arch/x86/mm/numa.c
parent34cc48b090691f420049b59c942e902d6acd99c3 (diff)
parent9c95d5d200b36881cd138463b0e5e9b8eeffe60a (diff)
downloadleg-kernel-2e33635db818301308163fa6f1aba0f2a3df6db2.tar.gz
Merge branch 'topic-numa' into leg-kernel
Diffstat (limited to 'arch/x86/mm/numa.c')
-rw-r--r--arch/x86/mm/numa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 9c086c57105c..968ac028c34e 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -1,4 +1,5 @@
/* Common code for 32 and 64-bit NUMA */
+#include <linux/acpi.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/string.h>
@@ -15,7 +16,6 @@
#include <asm/e820.h>
#include <asm/proto.h>
#include <asm/dma.h>
-#include <asm/acpi.h>
#include <asm/amd_nb.h>
#include "numa_internal.h"