diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-05-24 11:36:41 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 16:32:51 -0400 |
| commit | 1798bc22b2790bf2a956588e6b17c36ef79ceff7 (patch) | |
| tree | 68dd3275aa52221fa4edeca4982f05be8e21a437 /arch/x86/kernel/Makefile | |
| parent | fd5cea02de100197a4c26d9e103508cf09b50a82 (diff) | |
x86: nmi_32/64.c - merge down nmi_32.c and nmi_64.c to nmi.c
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5e618c3b4720..d5dd6668225f 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -53,7 +53,7 @@ obj-$(CONFIG_X86_32_SMP) += smpcommon.o | |||
| 53 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o | 53 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o |
| 54 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o | 54 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o |
| 55 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o | 55 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o |
| 56 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_$(BITS).o nmi_$(BITS).o | 56 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_$(BITS).o nmi.o |
| 57 | obj-$(CONFIG_X86_IO_APIC) += io_apic_$(BITS).o | 57 | obj-$(CONFIG_X86_IO_APIC) += io_apic_$(BITS).o |
| 58 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o | 58 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o |
| 59 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o | 59 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o |