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
x86: fold apic_ops into genapic
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
nmi.c
diff --git
a/arch/x86/kernel/nmi.c
b/arch/x86/kernel/nmi.c
index bdfad80c3cf196e752f8cf16ce8a3f37ed096c6c..48b9ca5e088c0a9d9d100fe244caf1a4a8f531ac 100644
(file)
--- a/
arch/x86/kernel/nmi.c
+++ b/
arch/x86/kernel/nmi.c
@@
-11,7
+11,7
@@
* Mikael Pettersson : PM converted to driver model. Disable/enable API.
*/
-#include <asm/apic.h>
+#include <asm/
gen
apic.h>
#include <linux/nmi.h>
#include <linux/mm.h>