commit c1eeb2de41d7015678bdd412b48a5f071b84e29a
author Yinghai Lu <yinghai@kernel.org> Mon Feb 16 23:02:14 2009 -0800
committer Ingo Molnar <mingo@elte.hu> Tue Feb 17 12:22:20 2009 +0100
tree 6af99f46f557f9e854e882deac52d23b2fadb5a2
parent 06cd9a7dc8a58186060a91b6ddc031057435fd34

x86: fold apic_ops into genapic

Impact: cleanup

make it simpler, don't need have one extra struct.

v2: fix the sgi_uv build

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/nmi.c

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index bdfad80..48b9ca5 100644
--- 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/genapic.h>
 
 #include <linux/nmi.h>
 #include <linux/mm.h>