Merge with Linux 2.4.0-test12.

1 files changed, 8 insertions, 23 deletions

diff --git a/arch/mips64/mm/Makefile b/arch/mips64/mm/Makefile
index fe95aff18..2505f05bd 100644
--- a/arch/mips64/mm/Makefile
+++ b/arch/mips64/mm/Makefile
@@ -1,33 +1,18 @@
-# $Id: Makefile,v 1.4 2000/01/17 23:32:46 ralf Exp $
 #
 # Makefile for the Linux/MIPS-specific parts of the memory manager.
 #
 
 O_TARGET := mm.o
-O_OBJS	 := extable.o init.o fault.o loadmmu.o
 
-ifdef CONFIG_CPU_R4300
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R4X00
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R5000
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_NEVADA
-O_OBJS	+= r4xx0.o
-endif
-ifdef CONFIG_CPU_R10000
-O_OBJS	+= andes.o
-endif
+obj-y	 := extable.o init.o fault.o loadmmu.o
 
-ifdef CONFIG_SGI_IP22
-O_OBJS   += umap.o
-endif
+obj-$(CONFIG_CPU_R4300)		+= r4xx0.o
+obj-$(CONFIG_CPU_R4X00)		+= r4xx0.o
+obj-$(CONFIG_CPU_R5000)		+= r4xx0.o
+obj-$(CONFIG_CPU_NEVADA)	+= r4xx0.o
+obj-$(CONFIG_CPU_R10000)	+= andes.o
+obj-$(CONFIG_SGI_IP22)		+= umap.o
 
-ifdef CONFIG_BAGET_MIPS
-O_OBJS   += umap.o
-endif
+O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
 
 include $(TOPDIR)/Rules.make