===== arch/i386/config.in 1.55 vs edited =====
--- 1.55/arch/i386/config.in	Tue Oct  8 13:40:32 2002
+++ edited/arch/i386/config.in	Tue Oct  8 13:53:06 2002
@@ -472,6 +472,9 @@
    define_bool CONFIG_X86_IO_APIC n
    define_bool CONFIG_X86_LOCAL_APIC n
    define_bool CONFIG_X86_FIND_SMP_CONFIG y
+   if [ "$CONFIG_SMP" = "y" ]; then
+      define_bool CONFIG_X86_TRAMPOLINE y
+   fi
 else
    if [ "$CONFIG_SMP" = "y" ]; then
       define_bool CONFIG_X86_SMP y
@@ -479,6 +482,7 @@
       define_bool CONFIG_X86_IO_APIC y
       define_bool CONFIG_X86_LOCAL_APIC y
       define_bool CONFIG_X86_MPPARSE y
+      define_bool CONFIG_X86_TRAMPOLINE y
    fi
    define_bool CONFIG_X86_BIOS_REBOOT y
 fi
===== arch/i386/kernel/Makefile 1.28 vs edited =====
--- 1.28/arch/i386/kernel/Makefile	Tue Oct  8 13:40:32 2002
+++ edited/arch/i386/kernel/Makefile	Tue Oct  8 13:51:46 2002
@@ -20,7 +20,8 @@
 obj-$(CONFIG_APM)		+= apm.o
 obj-$(CONFIG_ACPI)		+= acpi.o
 obj-$(CONFIG_ACPI_SLEEP)	+= acpi_wakeup.o
-obj-$(CONFIG_X86_SMP)		+= smp.o smpboot.o trampoline.o
+obj-$(CONFIG_X86_SMP)		+= smp.o smpboot.o
+obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
===== arch/i386/mach-voyager/Makefile 1.8 vs edited =====
--- 1.8/arch/i386/mach-voyager/Makefile	Sun Sep 22 11:58:59 2002
+++ edited/arch/i386/mach-voyager/Makefile	Tue Oct  8 13:52:16 2002
@@ -10,11 +10,8 @@
 EXTRA_CFLAGS	+= -I../kernel
 export-objs	:=
 
-# VPATH is needed for trampoline.o
-VPATH		:= ../kernel
-
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 
-obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o trampoline.o
+obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o
 
 include $(TOPDIR)/Rules.make