summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/mpparse.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 13:38:55 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-11 13:38:55 +0300
commit891393745aad5c5acdb01b6ce61c08d4cc064649 (patch)
tree7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /arch/x86/kernel/mpparse.c
parenta448720ca3248e8a7a426336885549d6e923fd8e (diff)
parent8e4921515c1a379539607eb443d51c30f4f7f338 (diff)
downloadlinux-891393745aad5c5acdb01b6ce61c08d4cc064649.tar.xz
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r--arch/x86/kernel/mpparse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index ad36377dc935..fa6bb263892e 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -27,6 +27,7 @@
#include <asm/e820.h>
#include <asm/trampoline.h>
#include <asm/setup.h>
+#include <asm/smp.h>
#include <mach_apic.h>
#ifdef CONFIG_X86_32