Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

[karo-tx-linux.git] / arch / x86 / kernel / apic / x2apic_uv_x.c

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index e9f8f8cdd57085db85dee8247b67150250308a42..7f179f1c467cba9fd12125b6161689d58f7f50d6 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -34,6 +34,7 @@
 #include <asm/uv/bios.h>
 #include <asm/uv/uv.h>
 #include <asm/apic.h>
+#include <asm/e820/api.h>
 #include <asm/ipi.h>
 #include <asm/smp.h>
 #include <asm/x86_init.h>