Merge with Linux 2.4.2.

1 files changed, 17 insertions, 17 deletions

diff --git a/arch/arm/nwfpe/Makefile b/arch/arm/nwfpe/Makefile
index a7f69d405..16c7c0aed 100644
--- a/arch/arm/nwfpe/Makefile
+++ b/arch/arm/nwfpe/Makefile
@@ -6,27 +6,27 @@
 
 USE_STANDARD_AS_RULE := true
 
-NWFPE_OBJS := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o \
-	      fpmodule.o fpopcode.o softfloat.o \
-	      single_cpdo.o double_cpdo.o extended_cpdo.o
+O_TARGET		:= math-emu.o
 
-ifeq ($(CONFIG_CPU_26),y)
-NWFPE_OBJS += entry26.o
-else
-NWFPE_OBJS += entry.o
-endif
+obj-y			:=
+obj-m			:=
+obj-n			:=
+
+list-multi		:= nwfpe.o
 
-ifeq ($(CONFIG_NWFPE),y)
-O_TARGET := math-emu.o
-O_OBJS = $(NWFPE_OBJS)
+obj-$(CONFIG_NWFPE)	+= nwfpe.o
+
+nwfpe-objs		:= fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o \
+			   fpmodule.o fpopcode.o softfloat.o \
+			   single_cpdo.o double_cpdo.o extended_cpdo.o
+
+ifeq ($(CONFIG_CPU_26),y)
+nwfpe-objs		+= entry26.o
 else
-  ifeq ($(CONFIG_NWFPE),m)
-    M_OBJS = nwfpe.o
-    MI_OBJS = $(NWFPE_OBJS)
-  endif
+nwfpe-objs		+= entry.o
 endif
 
 include $(TOPDIR)/Rules.make
 
-nwfpe.o: $(MI_OBJS) $(MIX_OBJS)
-	 $(LD) $(LD_RFLAG) -r -o $@ $(MI_OBJS) $(MIX_OBJS)
+nwfpe.o: $(nwfpe-objs)
+	$(LD) -r -o $@ $(nwfpe-objs)