---

yaml --- r: 65395 b: refs/heads/master c: 826c0e9 h: refs/heads/master i: 65393: 116066c 65391: 11410c1 v: v3
git-mirror · Oct 11, 2007 · f50f288 · f50f288
1 parent 37b5e8d
commit f50f288
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/i386/kernel/trampoline_32.S b/trunk/arch/i386/kernel/trampoline.S → trunk/arch/i386/kernel/trampoline_32.S