diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-02-17 02:02:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 06:22:20 -0500 |
| commit | c1eeb2de41d7015678bdd412b48a5f071b84e29a (patch) | |
| tree | 6af99f46f557f9e854e882deac52d23b2fadb5a2 /arch/x86/kernel/nmi.c | |
| parent | 06cd9a7dc8a58186060a91b6ddc031057435fd34 (diff) | |
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>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index bdfad80c3cf1..48b9ca5e088c 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Mikael Pettersson : PM converted to driver model. Disable/enable API. | 11 | * Mikael Pettersson : PM converted to driver model. Disable/enable API. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <asm/apic.h> | 14 | #include <asm/genapic.h> |
| 15 | 15 | ||
| 16 | #include <linux/nmi.h> | 16 | #include <linux/nmi.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |