Merge http://linux.bkbits.net/linux-2.5

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

35 files changed, 3 insertions, 363 deletions

diff --git a/arch/alpha/math-emu/Makefile b/arch/alpha/math-emu/Makefile
index 4486b79e338d..3f451cbbf946 100644
--- a/arch/alpha/math-emu/Makefile
+++ b/arch/alpha/math-emu/Makefile
@@ -11,11 +11,8 @@ obj-y		:= math.o qrnnd.o
 
 else
 
-list-multi	:= math-emu.o
 math-emu-objs	:= math.o qrnnd.o
 obj-m		:= math-emu.o
-math-emu.o: $(math-emu-objs)
-	$(LD) -r -o $@ $(math-emu-objs)
 
 endif
 
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 66e786486cca..e3c46966b3d8 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -1,9 +1,6 @@
 #
 # 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)
-
diff --git a/arch/arm/nwfpe/Makefile b/arch/arm/nwfpe/Makefile
index bcac0cf0e1ab..4eb26eb03cd1 100644
--- a/arch/arm/nwfpe/Makefile
+++ b/arch/arm/nwfpe/Makefile
@@ -1,6 +1,4 @@
 #
-# 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)
diff --git a/arch/sparc64/solaris/Makefile b/arch/sparc64/solaris/Makefile
index d3a2880d80b6..8dbb83fa326d 100644
--- a/arch/sparc64/solaris/Makefile
+++ b/arch/sparc64/solaris/Makefile
@@ -1,11 +1,6 @@
 #
 # Makefile for the Solaris binary emulation.
 #
-# 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 in the main makefile...
 
 ifeq ($(CONFIG_SOLARIS_EMUL),m)
 CPPFLAGS = $(MODFLAGS)
@@ -17,18 +12,9 @@ endif
 .S.o:
 	$(CC) $(AFLAGS) $(CPPFLAGS) -ansi -c $< -o $*.o
 
-list-multi := solaris.o
-
 solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \
 		ioctl.o ipc.o socksys.o timod.o
 
 obj-$(CONFIG_SOLARIS_EMUL) += solaris.o
 
-ifneq ($(CONFIG_SOLARIS_EMUL),y)
-do_it_all:
-endif
-
-solaris.o: $(solaris-objs)
-	$(LD) -r -o $@ $(solaris-objs)
-
 include $(TOPDIR)/Rules.make
diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile
index 59d8c51d57fd..45162e99841d 100644
--- a/drivers/acorn/block/Makefile
+++ b/drivers/acorn/block/Makefile
@@ -1,13 +1,6 @@
 #
 # 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)
diff --git a/drivers/acorn/scsi/Makefile b/drivers/acorn/scsi/Makefile
index 0610d8bf520d..65edeed36f6e 100644
--- a/drivers/acorn/scsi/Makefile
+++ b/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)
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
index 52f2e96ae406..5afffde2e58e 100644
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
@@ -1,4 +1,3 @@
-# File: drivers/atm/Makefile
 #
 # Makefile for the Linux network (ATM) device drivers.
 #
@@ -57,7 +56,6 @@ obj-$(CONFIG_ATM_FORE200E) += fore_200e.o
 
 EXTRA_CFLAGS=-g
 
-list-multi	:= fore_200e.o
 fore_200e-objs	:= fore200e.o $(FORE200E_FW_OBJS)
 
 include $(TOPDIR)/Rules.make
@@ -92,9 +90,6 @@ fore200e_mkfirm: fore200e_mkfirm.c
 	objcopy -Iihex $< -Obinary $@.gz
 	gzip -df $@.gz
 
-fore_200e.o: $(fore_200e-objs)
-	$(LD) -r -o $@ $(fore_200e-objs)
-
 # firmware dependency stuff taken from drivers/sound/Makefile
 FORE200E_FW_UP_TO_DATE :=
 
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1a9647b4a052..da59f3b8bca0 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -1,13 +1,6 @@
 #
 # Makefile for the kernel character 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 definitions are now inherited from the
-# parent makes..
-#
 
 #
 # This file contains the font map for the default (hardware) font
@@ -27,8 +20,6 @@ export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
 
 mod-subdirs	:=	ftape drm pcmcia
 
-list-multi	:=	
-
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
 CONSOLE  =console.o
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 42b4053ca37d..4b8ee1713eda 100644
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -7,12 +7,8 @@ O_TARGET	:= agp.o
 
 export-objs := agpgart_be.o
 
-list-multi := agpgart.o
 agpgart-objs := agpgart_fe.o agpgart_be.o
 
 obj-$(CONFIG_AGP) += agpgart.o
 
 include $(TOPDIR)/Rules.make
-
-agpgart.o: $(agpgart-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(agpgart-objs)
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index 819418eb5e00..a0ffc1152fe0 100644
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
@@ -3,7 +3,6 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 O_TARGET	:= drm.o
-list-multi	:= gamma.o tdfx.o r128.o mga.o i810.o radeon.o ffb.o
 
 gamma-objs  := gamma_drv.o gamma_dma.o
 tdfx-objs   := tdfx_drv.o
@@ -22,24 +21,3 @@ obj-$(CONFIG_DRM_I810)	+= i810.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
 
 include $(TOPDIR)/Rules.make
-
-gamma.o: $(gamma-objs) $(lib)
-	$(LD) -r -o $@ $(gamma-objs) $(lib)
-
-tdfx.o: $(tdfx-objs) $(lib)
-	$(LD) -r -o $@ $(tdfx-objs) $(lib)
-
-mga.o: $(mga-objs) $(lib)
-	$(LD) -r -o $@ $(mga-objs) $(lib)
-
-i810.o: $(i810-objs) $(lib)
-	$(LD) -r -o $@ $(i810-objs) $(lib)
-
-r128.o: $(r128-objs) $(lib)
-	$(LD) -r -o $@ $(r128-objs) $(lib)
-
-radeon.o: $(radeon-objs) $(lib)
-	$(LD) -r -o $@ $(radeon-objs) $(lib)
-
-ffb.o: $(ffb-objs) $(lib)
-	$(LD) -r -o $@ $(ffb-objs) $(lib)
diff --git a/drivers/fc4/Makefile b/drivers/fc4/Makefile
index 0a94cdf2716c..6fc3c1f58004 100644
--- a/drivers/fc4/Makefile
+++ b/drivers/fc4/Makefile
@@ -1,4 +1,3 @@
-# File: drivers/fc4/Makefile
 #
 # Makefile for the Linux Fibre Channel device drivers.
 #
@@ -7,7 +6,6 @@ L_TARGET := fc4.a
 
 export-objs := fc_syms.o
 
-list-multi := fc4.o
 fc4-objs := fc.o fc_syms.o
 
 obj-$(CONFIG_FC4) += fc4.o
@@ -15,6 +13,3 @@ obj-$(CONFIG_FC4_SOC) += soc.o
 obj-$(CONFIG_FC4_SOCAL) += socal.o
 
 include $(TOPDIR)/Rules.make
-
-fc4.o: $(fc4-objs)
-	$(LD) -r -o $@ $(fc4-objs)
diff --git a/drivers/hotplug/Makefile b/drivers/hotplug/Makefile
index d3f1c0f5b345..eff79bdfd691 100644
--- a/drivers/hotplug/Makefile
+++ b/drivers/hotplug/Makefile
@@ -4,8 +4,6 @@
 
 O_TARGET	:= vmlinux-obj.o
 
-list-multi	:= cpqphp.o pci_hotplug.o ibmphp.o
-
 export-objs	:= pci_hotplug_core.o pci_hotplug_util.o
 
 obj-$(CONFIG_HOTPLUG_PCI)		+= pci_hotplug.o
@@ -32,13 +30,3 @@ endif
 
 
 include $(TOPDIR)/Rules.make
-
-pci_hotplug.o: $(pci_hotplug-objs)
-	$(LD) -r -o $@ $(pci_hotplug-objs)
-
-cpqphp.o: $(cpqphp-objs)
-	$(LD) -r -o $@ $(cpqphp-objs)
-
-ibmphp.o: $(ibmphp-objs)
-	$(LD) -r -o $@ $(ibmphp-objs)
-
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 3142a91f6f01..3b127d14423a 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -11,7 +11,6 @@
 O_TARGET := idedriver.o
 
 export-objs		:= ide-taskfile.o ide.o ide-features.o ide-probe.o ataraid.o
-list-multi		:= ide-mod.o
 
 obj-y		:=
 obj-m		:=
@@ -77,6 +76,3 @@ ide-obj-$(CONFIG_PROC_FS)		+= ide-proc.o
 ide-mod-objs		:= ide-taskfile.o ide.o ide-probe.o ide-geometry.o ide-features.o ata-timing.o $(ide-obj-y)
 
 include $(TOPDIR)/Rules.make
-
-ide-mod.o: $(ide-mod-objs)
-	$(LD) -r -o $@ $(ide-mod-objs)
diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile
index 9c8aca29502b..db936394a041 100644
--- a/drivers/ieee1394/Makefile
+++ b/drivers/ieee1394/Makefile
@@ -6,7 +6,6 @@ O_TARGET := ieee1394drv.o
 
 export-objs := ieee1394_core.o ohci1394.o
 
-list-multi := ieee1394.o
 ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
 		 highlevel.o csr.o nodemgr.o
 
@@ -19,6 +18,3 @@ obj-$(CONFIG_IEEE1394_SBP2) += sbp2.o
 obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o
 
 include $(TOPDIR)/Rules.make
-
-ieee1394.o: $(ieee1394-objs)
-	$(LD) -r -o $@ $(ieee1394-objs)
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 66541f522318..61e60fa44735 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -5,7 +5,6 @@
 O_TARGET	:= mddev.o
 
 export-objs	:= md.o xor.o
-list-multi	:= lvm-mod.o
 lvm-mod-objs	:= lvm.o lvm-snap.o lvm-fs.o
 
 # Note: link order is important.  All raid personalities
@@ -22,6 +21,3 @@ obj-$(CONFIG_BLK_DEV_MD)	+= md.o
 obj-$(CONFIG_BLK_DEV_LVM)	+= lvm-mod.o
 
 include $(TOPDIR)/Rules.make
-
-lvm-mod.o: $(lvm-mod-objs)
-	$(LD) -r -o $@ $(lvm-mod-objs)
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index ed1b138de796..f691d13ac565 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -1,13 +1,6 @@
 #
 # Makefile for the kernel character 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 definitions are now inherited from the
-# parent makes..
-#
 
 # Object file lists.
 
@@ -23,8 +16,6 @@ O_TARGET := radio.o
 
 export-objs     := miropcm20-rds-core.o
 
-list-multi	:= miropcm20.o
-
 miropcm20-objs	:= miropcm20-rds-core.o miropcm20-radio.o
 
 obj-$(CONFIG_RADIO_AZTECH) += radio-aztech.o
@@ -44,6 +35,3 @@ obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o
 
 include $(TOPDIR)/Rules.make
-
-miropcm20.o: $(miropcm20-objs)
-	$(LD) -r -o $@ $(miropcm20-objs)
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 75d5bc7183c5..50c24aa1d0ac 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -1,13 +1,6 @@
 #
 # Makefile for the kernel character 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 definitions are now inherited from the
-# parent makes..
-#
 
 # Object file lists.
 
@@ -16,10 +9,6 @@ obj-m		:=
 obj-n		:=
 obj-		:=
 
-SUB_DIRS     := 
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
-
 O_TARGET := video.o
 
 # All of the (potential) objects that export symbols.
@@ -27,7 +16,6 @@ O_TARGET := video.o
 
 export-objs     :=	i2c-old.o videodev.o bttv-if.o cpia.o video-buf.o
 
-list-multi	:=	bttv.o zoran.o
 bttv-objs	:=	bttv-driver.o bttv-cards.o bttv-if.o \
 			bttv-risc.o bttv-vbi.o
 zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o
@@ -59,29 +47,4 @@ obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-
-multi-y         := $(filter $(list-multi), $(obj-y))
-multi-m         := $(filter $(list-multi), $(obj-m))
-int-y           := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m           := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Files that are both resident and modular: remove from modular.
-
-obj-m           := $(filter-out $(obj-y), $(obj-m))
-int-m           := $(filter-out $(int-y), $(int-m))
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y           := $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
 include $(TOPDIR)/Rules.make
-
-fastdep:
-
-zoran.o: zr36120.o zr36120_i2c.o zr36120_mem.o
-	$(LD) $(LD_RFLAG) -r -o $@ zr36120.o zr36120_i2c.o zr36120_mem.o
-
-bttv.o: $(bttv-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(bttv-objs)
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index a1ddc8e105df..601a0cc2583f 100644
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -1,14 +1,7 @@
 #
 # Makefile for the LSI Logic Fusion MPT (Message Passing Technology) 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.
-#
-# Note 3! If you want to turn on various debug defines for an extended period of
+# Note! If you want to turn on various debug defines for an extended period of
 # time but don't want them lingering around in the Makefile when you pass it on 
 # to someone else, use the MPT_CFLAGS env variable (thanks Steve). -nromer
 
@@ -54,19 +47,11 @@ O_TARGET := fusion.o
 
 export-objs	:= mptbase.o mptscsih.o mptlan.o mptctl.o isense.o
 
-# ? what's list-multi for?
-#list-multi	:= fusion.o mptscsih.o
-
 obj-$(CONFIG_FUSION)		+= mptbase.o mptscsih.o
 obj-$(CONFIG_FUSION_ISENSE)	+= isense.o
 obj-$(CONFIG_FUSION_CTL)	+= mptctl.o
 obj-$(CONFIG_FUSION_LAN)	+= mptlan.o
 
-O_OBJS		:= $(filter-out		$(export-objs), $(obj-y))
-OX_OBJS		:= $(filter		$(export-objs), $(obj-y))
-M_OBJS		:= $(sort $(filter-out	$(export-objs), $(obj-m)))
-MX_OBJS		:= $(sort $(filter	$(export-objs), $(obj-m)))
-
 include $(TOPDIR)/Rules.make
 
 
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index b20666e650eb..fb2a81aafddd 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,12 +1,6 @@
 #
 # Makefile for the memory technology 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 definitions are now inherited from the
-# parent makes..
 #
 # $Id: Makefile,v 1.63 2001/06/13 09:43:07 dwmw2 Exp $
 
@@ -20,7 +14,6 @@ obj-            :=
 O_TARGET	:= mtdlink.o
 
 export-objs	:= mtdcore.o mtdpart.o redboot.o bootldr.o afs.o
-list-multi	:= nftl.o
 
 mod-subdirs	:= 
 subdir-y	:= chips maps devices nand
@@ -59,7 +52,3 @@ obj-$(CONFIG_NFTL)		+= nftl.o
 nftl-objs	:= nftlcore.o nftlmount.o
 
 include $(TOPDIR)/Rules.make
-
-nftl.o: $(nftl-objs)
-	$(LD) -r -o $@ $(nftl-objs)
-
diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile
index ed1f6d1a053c..33f94ed7b63f 100644
--- a/drivers/parport/Makefile
+++ b/drivers/parport/Makefile
@@ -13,7 +13,6 @@ O_TARGET := driver.o
 
 export-objs	:= init.o parport_pc.o
 
-list-multi	:= parport.o
 parport-objs	:= share.o ieee1284.o ieee1284_ops.o init.o procfs.o
 
 ifeq ($(CONFIG_PARPORT_1284),y)
@@ -23,7 +22,7 @@ endif
 obj-$(CONFIG_PARPORT)		+= parport.o
 obj-$(CONFIG_PARPORT_PC)	+= parport_pc.o
 obj-$(CONFIG_PARPORT_SERIAL)	+= parport_serial.o
-obj-$(CONFIG_PARPORT_PC_PCMCIA)+= parport_cs.o
+obj-$(CONFIG_PARPORT_PC_PCMCIA) += parport_cs.o
 obj-$(CONFIG_PARPORT_AMIGA)	+= parport_amiga.o
 obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o
 obj-$(CONFIG_PARPORT_ATARI)	+= parport_atari.o
@@ -31,6 +30,3 @@ obj-$(CONFIG_PARPORT_SUNBPP)	+= parport_sunbpp.o
 obj-$(CONFIG_PARPORT_GSC)	+= parport_gsc.o
 
 include $(TOPDIR)/Rules.make
-
-parport.o: $(parport-objs)
-	$(LD) -r -o $@ $(parport-objs)
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index dda91ec562e0..a7b90586c5de 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -1,19 +1,11 @@
 #
 # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
 #
-# 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 definitions are now inherited from the
-# parent makes..
 
 O_TARGET := pcmcia.o
 
 export-objs := ds.o cs.o yenta.o pci_socket.o
 
-list-multi := pcmcia_core.o yenta_socket.o
-
 yenta_socket-objs := pci_socket.o yenta.o
 pcmcia_core-objs := cistpl.o rsrc_mgr.o bulkmem.o cs.o
 
@@ -83,12 +75,3 @@ sa1100_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_YOPY)		+= sa1100_yopy.o
 
 include $(TOPDIR)/Rules.make
-
-pcmcia_core.o:  $(pcmcia_core-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(pcmcia_core-objs)
-
-sa1100_cs.o: $(sa1100_cs-objs-y)
-	$(LD) -r -o $@ $(sort $(sa1100_cs-objs-y))
-
-yenta_socket.o: $(yenta_socket-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(yenta_socket-objs)
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile
index f0ab45ce35b3..84b49924f679 100644
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@ -1,17 +1,10 @@
 #
 # Makefile for the kernel Plug-and-Play 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 definitions are now inherited from the
-# parent makes..
 
 O_TARGET := pnp.o
 
 export-objs := isapnp.o pnpbios_core.o
-list-multi := isa-pnp.o pnpbios.o
 
 isa-pnp-proc-$(CONFIG_PROC_FS) = isapnp_proc.o
 pnpbios-proc-$(CONFIG_PROC_FS) = pnpbios_proc.o
@@ -23,9 +16,3 @@ obj-$(CONFIG_ISAPNP) += isa-pnp.o
 obj-$(CONFIG_PNPBIOS) += pnpbios.o
 
 include $(TOPDIR)/Rules.make
-
-isa-pnp.o: $(isa-pnp-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(isa-pnp-objs)
-
-pnpbios.o: $(pnpbios-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(pnpbios-objs)
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile
index bd352622f458..2f051aa0b12e 100644
--- a/drivers/s390/block/Makefile
+++ b/drivers/s390/block/Makefile
@@ -4,7 +4,6 @@
 
 O_TARGET := s390-block.o
 
-list-multi := dasd_mod.o dasd_eckd_mod.o dasd_fba_mod.o dasd_diag_mod.o
 export-objs := dasd.o
 
 dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
@@ -19,16 +18,3 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
 obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 
 include $(TOPDIR)/Rules.make
-
-dasd_mod.o: $(dasd_mod-objs)
-	$(LD) -r -o $@ $(dasd_mod-objs)
-
-dasd_eckd_mod.o: $(dasd_eckd_mod-objs)
-	$(LD) -r -o $@ $(dasd_eckd_mod-objs)
-
-dasd_fba_mod.o: $(dasd_fba_mod-objs)
-	$(LD) -r -o $@ $(dasd_fba_mod-objs)
-
-dasd_diag_mod.o: $(dasd_diag_mod-objs)
-	$(LD) -r -o $@ $(dasd_diag_mod-objs)
-
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 7fc15b395eb8..ecdd02990d5e 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -4,7 +4,6 @@
 
 O_TARGET := s390-char.o
 
-list-multi	:= tub3270.o tape390.o
 export-objs	:= hwc_rw.o
 
 tub3270-objs := tuball.o tubfs.o tubtty.o \
@@ -25,10 +24,3 @@ obj-$(CONFIG_TN3270) += tub3270.o
 obj-$(CONFIG_S390_TAPE) += tape390.o
 
 include $(TOPDIR)/Rules.make
-
-tub3270.o: $(tub3270-objs)
-	$(LD) -r -o $@ $(tub3270-objs)
-
-tape390.o: $(tape390-objs)
-	$(LD) -r -o $@ $(tape390-objs)
-
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 5300da79f371..7ec7e86396b7 100644
--- a/drivers/s390/net/Makefile
+++ b/drivers/s390/net/Makefile
@@ -4,7 +4,6 @@
 
 O_TARGET := s390-net.o
 
-list-multi := ctc.o
 export-objs := iucv.o fsm.o
 
 ctc-objs := ctcmain.o ctctty.o
@@ -14,7 +13,3 @@ obj-$(CONFIG_CTC) += ctc.o
 obj-$(CONFIG_IUCV) += netiucv.o
 
 include $(TOPDIR)/Rules.make
-
-ctc.o: $(ctc-objs)
-	$(LD) -r -o $@ $(ctc-objs)
-
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index 12ee27686e6c..e7fa4a8c20f6 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -12,7 +12,6 @@ O_TARGET := sunchar.o
 export-objs := su.o bbc_i2c.o
 obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
 
-list-multi := vfc.o bbc.o
 vfc-objs := vfc_dev.o vfc_i2c.o
 bbc-objs := bbc_i2c.o bbc_envctrl.o
 
@@ -36,9 +35,3 @@ obj-$(CONFIG_BBC_I2C)			+= bbc.o
 include $(TOPDIR)/Rules.make
 
 sunkbdmap.o: sunkeymap.c
-
-vfc.o: $(vfc-objs)
-	$(LD) -r -o $@ $(vfc-objs)
-
-bbc.o: $(bbc-objs)
-	$(LD) -r -o $@ $(bbc-objs)
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2d5af93c5581..b909c50a85fd 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -132,7 +132,6 @@ obj-$(CONFIG_BLK_DEV_SD)	+= sd_mod.o
 obj-$(CONFIG_BLK_DEV_SR)	+= sr_mod.o
 obj-$(CONFIG_CHR_DEV_SG)	+= sg.o
 
-list-multi	:= scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o cpqfc.o
 scsi_mod-objs	:= scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
 			scsi_proc.o scsi_error.o scsi_queue.o scsi_lib.o \
 			scsi_merge.o scsi_scan.o scsi_syms.o
@@ -145,25 +144,6 @@ cpqfc-objs	:= cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \
 
 include $(TOPDIR)/Rules.make
 
-
-scsi_mod.o: $(scsi_mod-objs)
-	$(LD) -r -o $@ $(scsi_mod-objs)
-
-sd_mod.o: $(sd_mod-objs)
-	$(LD) -r -o $@ $(sd_mod-objs)
-
-sr_mod.o: $(sr_mod-objs)
-	$(LD) -r -o $@ $(sr_mod-objs)
-
-initio.o: $(initio-objs)
-	$(LD) -r -o $@ $(initio-objs)
-
-a100u2w.o: $(a100u2w-objs)
-	$(LD) -r -o $@ $(a100u2w-objs)
-
-cpqfc.o: $(cpqfc-objs)
-	$(LD) -r -o $@ $(cpqfc-objs)
-
 53c8xx_d.h: 53c7,8xx.scr script_asm.pl
 	ln -sf 53c7,8xx.scr fake8.c
 	$(CPP) $(CPPFLAGS) -traditional -DCHIP=810 fake8.c | grep -v '^#' | $(PERL) script_asm.pl 
diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile
index 512ee5cbd043..d74035d8c4d4 100644
--- a/drivers/scsi/aic7xxx/Makefile
+++ b/drivers/scsi/aic7xxx/Makefile
@@ -1,13 +1,9 @@
 #
-# drivers/scsi/aic7xxx/Makefile
-#
 # Makefile for the Linux aic7xxx SCSI driver.
 #
 
 O_TARGET := aic7xxx_drv.o
 
-list-multi	:= aic7xxx_mod.o
-
 obj-$(CONFIG_SCSI_AIC7XXX)	+= aic7xxx_mod.o
 
 #EXTRA_CFLAGS += -g
@@ -31,9 +27,6 @@ MOD_TARGET = aic7xxx.o
 
 include $(TOPDIR)/Rules.make
 
-aic7xxx_mod.o: aic7xxx_seq.h aic7xxx_reg.h $(AIC7XXX_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $(AIC7XXX_OBJS)
-
 ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
 aic7xxx_seq.h aic7xxx_reg.h: aic7xxx.seq aic7xxx.reg aicasm/aicasm
 	aicasm/aicasm -I. -r aic7xxx_reg.h -o aic7xxx_seq.h aic7xxx.seq
diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile
index b52924dd5077..e189f1a25b87 100644
--- a/drivers/scsi/pcmcia/Makefile
+++ b/drivers/scsi/pcmcia/Makefile
@@ -1,6 +1,4 @@
 #
-# drivers/scsi/pcmcia/Makefile
-#
 # Makefile for the Linux PCMCIA SCSI drivers.
 #
 
@@ -21,18 +19,8 @@ obj-$(CONFIG_PCMCIA_FDOMAIN)	+= fdomain_cs.o
 obj-$(CONFIG_PCMCIA_AHA152X)	+= aha152x_cs.o
 obj-$(CONFIG_PCMCIA_NINJA_SCSI)	+= nsp_cs.o
 
-list-multi	:= qlogic_cs.o fdomain_cs.o aha152x_cs.o
 aha152x_cs-objs	:= aha152x_stub.o aha152x.o
 fdomain_cs-objs	:= fdomain_stub.o fdomain.o
 qlogic_cs-objs	:= qlogic_stub.o qlogicfas.o
 
 include $(TOPDIR)/Rules.make
-
-aha152x_cs.o: $(aha152x_cs-objs)
-	$(LD) -r -o $@ $(aha152x_cs-objs)
-
-fdomain_cs.o: $(fdomain_cs-objs)
-	$(LD) -r -o $@ $(fdomain_cs-objs)
-
-qlogic_cs.o: $(qlogic_cs-objs)
-	$(LD) -r -o $@ $(qlogic_cs-objs)
diff --git a/drivers/scsi/sym53c8xx_2/Makefile b/drivers/scsi/sym53c8xx_2/Makefile
index b352b03861e2..3417dea52d83 100644
--- a/drivers/scsi/sym53c8xx_2/Makefile
+++ b/drivers/scsi/sym53c8xx_2/Makefile
@@ -1,15 +1,10 @@
-# File: drivers/sym53c8xx/Makefile
 # Makefile for the NCR/SYMBIOS/LSI 53C8XX PCI SCSI controllers driver.
 
-list-multi := sym53c8xx.o
 sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o
 obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o
 
 EXTRA_CFLAGS += -I.
 
-sym53c8xx.o: $(sym53c8xx-objs)
-	$(LD) -r -o $@ $(sym53c8xx-objs)
-
 include $(TOPDIR)/Rules.make
 
 clean:
diff --git a/fs/jffs/Makefile b/fs/jffs/Makefile
index 546b9a739a01..878887381d8c 100644
--- a/fs/jffs/Makefile
+++ b/fs/jffs/Makefile
@@ -3,13 +3,6 @@
 #
 # $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $
 #
-# 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 definitions are now in the main makefile...
-
-list-multi := jffs.o
 
 jffs-objs := jffs_fm.o intrep.o
 
diff --git a/net/atm/Makefile b/net/atm/Makefile
index bf0a67b9ae37..3c2b16ab1f73 100644
--- a/net/atm/Makefile
+++ b/net/atm/Makefile
@@ -1,17 +1,11 @@
 #
 # Makefile for the ATM Protocol Families.
 #
-# 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 in the main makefile...
 
 O_TARGET	:= atm.o
 
 export-objs 	:= common.o atm_misc.o raw.o resources.o ipcommon.o proc.o
 
-list-multi	:= mpoa.o
 mpoa-objs	:= mpc.o mpoa_caches.o mpoa_proc.o
 
 obj-$(CONFIG_ATM) := addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o
@@ -36,6 +30,3 @@ obj-$(CONFIG_ATM_MPOA) += mpoa.o
 obj-$(CONFIG_PPPOATM) += pppoatm.o
 
 include $(TOPDIR)/Rules.make
-
-mpoa.o: $(mpoa-objs)
-	$(LD) -r -o mpoa.o $(mpoa-objs)
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 013523ab4bee..536f9d4fba0b 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -1,9 +1,9 @@
 #
 # Makefile for the Bluetooth subsystem
 #
+
 O_TARGET	:= bluetooth.o
 
-list-multi	:= hci.o l2cap.o
 export-objs	:= syms.o
 hci-objs	:= af_bluetooth.o hci_core.o hci_sock.o lib.o syms.o
 l2cap-objs	:= l2cap_core.o l2cap_proc.o
@@ -12,9 +12,3 @@ obj-$(CONFIG_BLUEZ) += hci.o
 obj-$(CONFIG_BLUEZ_L2CAP) += l2cap.o
 
 include $(TOPDIR)/Rules.make
-
-hci.o: $(hci-objs)
-	$(LD) -r -o $@ $(hci-objs)
-
-l2cap.o: $(l2cap-objs)
-	$(LD) -r -o $@ $(l2cap-objs)
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 90c33ec64130..5c72051c5e6e 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -1,19 +1,11 @@
 #
 # Makefile for the netfilter modules on top of IPv4.
 #
-# 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 in the main makefile...
 
 O_TARGET := netfilter.o
 
 export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
 
-# Multipart objects.
-list-multi		:= ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o
-
 # objects for the conntrack and NAT core (used by standalone and backw. compat)
 ip_nf_conntrack-objs	:= ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o
 ip_nf_nat-objs		:= ip_nat_core.o ip_nat_helper.o ip_nat_proto_unknown.o ip_nat_proto_tcp.o ip_nat_proto_udp.o ip_nat_proto_icmp.o
@@ -95,15 +87,3 @@ obj-$(CONFIG_IP_NF_COMPAT_IPFWADM) += ipfwadm.o
 obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
 
 include $(TOPDIR)/Rules.make
-
-ip_conntrack.o: $(ip_conntrack-objs)
-	$(LD) -r -o $@ $(ip_conntrack-objs)
-
-iptable_nat.o: $(iptable_nat-objs)
-	$(LD) -r -o $@ $(iptable_nat-objs)
-
-ipfwadm.o: $(ipfwadm-objs)
-	$(LD) -r -o $@ $(ipfwadm-objs)
-
-ipchains.o: $(ipchains-objs)
-	$(LD) -r -o $@ $(ipchains-objs)
diff --git a/net/irda/ircomm/Makefile b/net/irda/ircomm/Makefile
index 12c52cf24ca8..fe375e622bc4 100644
--- a/net/irda/ircomm/Makefile
+++ b/net/irda/ircomm/Makefile
@@ -1,15 +1,9 @@
 #
 # Makefile for the Linux IrDA IrCOMM protocol layer.
 #
-# 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 in the main makefile...
 
 O_TARGET := ircomm_and_tty.o
 
-list-multi := ircomm.o ircomm-tty.o
 ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o
 ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
 
@@ -17,9 +11,3 @@ obj-$(CONFIG_IRCOMM) += ircomm.o ircomm-tty.o
 
 include $(TOPDIR)/Rules.make
 
-ircomm.o:  $(ircomm-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(ircomm-objs)
-
-ircomm-tty.o: $(ircomm-tty-objs)
-	$(LD) $(LD_RFLAG) -r -o $@ $(ircomm-tty-objs)
-