From f50f28839377f455e3d58071b19d3b988c9f9289 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:56 +0200 Subject: [PATCH] --- yaml --- r: 65395 b: refs/heads/master c: 826c0e9e6ced6c1bb2d3f067ddff93d706b86446 h: refs/heads/master i: 65393: 116066c96a6c7f5ca74498a46b08423d438762c4 65391: 11410c1427e510c1c0e722b36fb86e2cbfa5a6fe v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{trampoline.S => trampoline_32.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{trampoline.S => trampoline_32.S} (100%) diff --git a/[refs] b/[refs] index 4a0cffbf172d..155b035eaf16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b352b7fe2271c48600a71f50546b8a3567a0e7fe +refs/heads/master: 826c0e9e6ced6c1bb2d3f067ddff93d706b86446 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index c718afe95457..4d7a8e8dc44e 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -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 diff --git a/trunk/arch/i386/kernel/trampoline.S b/trunk/arch/i386/kernel/trampoline_32.S similarity index 100% rename from trunk/arch/i386/kernel/trampoline.S rename to trunk/arch/i386/kernel/trampoline_32.S