diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 15:43:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:36 -0400 |
commit | 85bdddec5eaeb2464bf1cad6a17225416e65a8d6 (patch) | |
tree | e3fec5d05f020338a985c45d80fda1dc3bc42b41 /arch/x86/kernel/Makefile | |
parent | cfa08d6cc3421bb08ebaa34467107e58999a7c28 (diff) |
x86: merge mpparse_{32,64}.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 0bf2fb55aa74..fdd8395e0ed3 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -51,7 +51,7 @@ obj-$(CONFIG_X86_SMP) += smpboot.o tsc_sync.o ipi.o tlb_$(BITS).o | |||
51 | obj-$(CONFIG_X86_32_SMP) += smpcommon.o | 51 | obj-$(CONFIG_X86_32_SMP) += smpcommon.o |
52 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o | 52 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o |
53 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o | 53 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o |
54 | obj-$(CONFIG_X86_MPPARSE) += mpparse_$(BITS).o | 54 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o |
55 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_$(BITS).o nmi_$(BITS).o | 55 | obj-$(CONFIG_X86_LOCAL_APIC) += apic_$(BITS).o nmi_$(BITS).o |
56 | obj-$(CONFIG_X86_IO_APIC) += io_apic_$(BITS).o | 56 | obj-$(CONFIG_X86_IO_APIC) += io_apic_$(BITS).o |
57 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o | 57 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o |