git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/asm', 'x86/cleanups' and 'x86/headers' into x86/core
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
intel.c
diff --git
a/arch/x86/kernel/cpu/intel.c
b/arch/x86/kernel/cpu/intel.c
index
c8ff69a
..
25c559b
100644
(file)
--- a/
arch/x86/kernel/cpu/intel.c
+++ b/
arch/x86/kernel/cpu/intel.c
@@
-24,7
+24,6
@@
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/mpspec.h>
#include <asm/apic.h>
-#include <asm/genapic.h>
#endif
static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)