]> err.no Git - linux-2.6/commitdiff
i386: prepare shared kernel/trampoline.S
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:12:56 +0000 (11:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:12:56 +0000 (11:12 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/i386/kernel/Makefile
arch/i386/kernel/trampoline_32.S [moved from arch/i386/kernel/trampoline.S with 100% similarity]

index c718afe9545776c6a325d72d6bdb0e625c355878..4d7a8e8dc44ee45de3173f1bde307e9689b839f2 100644 (file)
@@ -20,7 +20,7 @@ obj-$(CONFIG_MICROCODE)               += microcode.o
 obj-$(CONFIG_APM)              += apm_32.o
 obj-$(CONFIG_X86_SMP)          += smp_32.o smpboot_32.o tsc_sync.o
 obj-$(CONFIG_SMP)              += smpcommon_32.o
-obj-$(CONFIG_X86_TRAMPOLINE)   += trampoline.o
+obj-$(CONFIG_X86_TRAMPOLINE)   += trampoline_32.o
 obj-$(CONFIG_X86_MPPARSE)      += mpparse_32.o
 obj-$(CONFIG_X86_LOCAL_APIC)   += apic_32.o nmi_32.o
 obj-$(CONFIG_X86_IO_APIC)      += io_apic_32.o