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 'linus' into x86/mce3
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce_intel_64.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 046087e9808f1a88584b292db9bdf9c603bc723e..f2ef6952c4003284c5d0886a299d14ca734ba09c 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@
-15,7
+15,6
@@
#include <asm/hw_irq.h>
#include <asm/idle.h>
#include <asm/therm_throt.h>
-#include <asm/apic.h>
#include "mce.h"