Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-arm

arch/arm/mach-sa1100/Makefile

 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
 
 USE_STANDARD_AS_RULE := true
 
@@ -115,7 +112,6 @@ export-objs				+= yopy.o
 obj-$(CONFIG_LEDS) += $(led-y)
 
 # SA1110 USB client support
-list-multi += sa1100usb_core.o
 sa1100usb_core-objs := usb_ctl.o usb_ep0.o usb_recv.o usb_send.o
 obj-$(CONFIG_SA1100_USB) += sa1100usb_core.o
 obj-$(CONFIG_SA1100_USB_NETLINK) += usb-eth.o
@@ -125,7 +121,3 @@ obj-$(CONFIG_SA1100_USB_CHAR) += usb-char.o
 obj-$(CONFIG_PM) += pm.o sleep.o
 
 include $(TOPDIR)/Rules.make
-
-sa1100usb_core.o: $(sa1100usb_core-objs)
-	$(LD) -r -o $@ $(sa1100usb_core-objs)
-

arch/arm/nwfpe/Makefile

 #
-# linux/arch/arm/nwfpe/Makefile
-#
 # Copyright (C) 1998, 1999, 2001 Philip Blundell
 #
 
@@ -12,8 +10,6 @@ obj-y			:=
 obj-m			:=
 obj-n			:=
 
-list-multi		:= nwfpe.o
-
 obj-$(CONFIG_FPE_NWFPE)	+= nwfpe.o
 
 nwfpe-objs		:= fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o \
@@ -27,6 +23,3 @@ nwfpe-objs		+= entry.o
 endif
 
 include $(TOPDIR)/Rules.make
-
-nwfpe.o: $(nwfpe-objs)
-	$(LD) -r -o $@ $(nwfpe-objs)

drivers/acorn/block/Makefile

 #
 # Makefile for the Acorn block device drivers.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now inherited from the
-# parent makefile.
-#
 
 USE_STANDARD_AS_RULE := true
 
@@ -19,7 +12,6 @@ obj-n		:=
 obj-		:=
 
 export-objs	:=
-list-multi	:= fd1772_mod.o mfmhd_mod.o
 fd1772_mod-objs	:= fd1772.o fd1772dma.o
 mfmhd_mod-objs	:= mfmhd.o mfm.o
 
@@ -27,9 +19,3 @@ obj-$(CONFIG_BLK_DEV_FD1772)	+= fd1772_mod.o
 obj-$(CONFIG_BLK_DEV_MFM)	+= mfmhd_mod.o
 
 include $(TOPDIR)/Rules.make
-
-fd1772_mod.o: $(fd1772_mod-objs)
-	$(LD) -r -o $@ $(fd1772_mod-objs)
-
-mfmhd_mod.o: $(mfmhd_mod-objs)
-	$(LD) -r -o $@ $(mfmhd_mod-objs)

drivers/acorn/scsi/Makefile

@@ -12,7 +12,6 @@ obj-n		:=
 obj-		:=
 
 export-objs		:= fas216.o queue.o msgqueue.o
-list-multi		:= acornscsi_mod.o
 acornscsi_mod-objs	:= acornscsi.o acornscsi-io.o
 
 obj-$(CONFIG_SCSI_ACORNSCSI_3)	+= acornscsi_mod.o queue.o msgqueue.o
@@ -25,6 +24,3 @@ obj-$(CONFIG_SCSI_POWERTECSCSI)	+= powertec.o fas216.o queue.o msgqueue.o
 obj-$(CONFIG_SCSI_EESOXSCSI)	+= eesox.o fas216.o queue.o msgqueue.o
 
 include $(TOPDIR)/Rules.make
-
-acornscsi_mod.o: $(acornscsi_mod-objs)
-	$(LD) -r -o $@ $(acornscsi_mod-objs)