please apply
thanks
john
diff -Naur -X dontdiff linux-linus/arch/i386/oprofile/Makefile linux/arch/i386/oprofile/Makefile
--- linux-linus/arch/i386/oprofile/Makefile Wed Oct 16 19:08:39 2002
+++ linux/arch/i386/oprofile/Makefile Thu Oct 31 02:26:34 2002
@@ -1,5 +1,3 @@
-vpath %.c = . $(TOPDIR)/drivers/oprofile
-
obj-$(CONFIG_OPROFILE) += oprofile.o
DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
@@ -9,8 +7,6 @@
oprofile-objs := $(DRIVER_OBJS) init.o timer_int.o
-ifdef CONFIG_X86_LOCAL_APIC
-oprofile-objs += nmi_int.o op_model_athlon.o op_model_ppro.o
-endif
+oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_ppro.o
include $(TOPDIR)/Rules.make