projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
mpparse.c
diff --git
a/arch/x86/kernel/mpparse.c
b/arch/x86/kernel/mpparse.c
index fbca2e6223bf81d423d841a8c1cab153286a489a..d2b56489d70fb12781e6787c98b1ea13f7d08705 100644
(file)
--- a/
arch/x86/kernel/mpparse.c
+++ b/
arch/x86/kernel/mpparse.c
@@
-27,7
+27,6
@@
#include <asm/proto.h>
#include <asm/bios_ebda.h>
#include <asm/e820.h>
-#include <asm/trampoline.h>
#include <asm/setup.h>
#include <asm/smp.h>