kbuild: Remove O_TARGETS which creeped back in

O_TARGET should basically be dead for non arch-specific code in 2.5
(it's still functional, though), so kill the cases where it creeped back
in. 

drivers/ide/Makefile

@@ -9,18 +9,8 @@
 #
 export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o
 
-all-subdirs	:= arm legacy pci ppc
-mod-subdirs	:= arm legacy pci ppc
-
-obj-y		:=
-obj-m		:=
-ide-obj-y	:=
-
-subdir-$(CONFIG_BLK_DEV_IDEPCI)	+= pci
-subdir-$(CONFIG_BLK_DEV_IDE) += legacy ppc arm pci
-
 # First come modules that register themselves with the core
-obj-y		+=	pci/idedriver-pci.o
+obj-$(CONFIG_BLK_DEV_IDEPCI)		+= pci/
 
 # Core IDE code - must come before legacy
 
@@ -38,10 +28,6 @@ ifeq ($(CONFIG_BLK_DEV_IDE),y)
 obj-$(CONFIG_PROC_FS)			+= ide-proc.o
 endif
 
-ifeq ($(CONFIG_BLK_DEV_IDE),y)
-  obj-y		+= legacy/idedriver-legacy.o
-  obj-y		+= ppc/idedriver-ppc.o
-  obj-y		+= arm/idedriver-arm.o
-endif
+obj-$(CONFIG_BLK_DEV_IDE)		+= legacy/ ppc/ arm/
 
 include $(TOPDIR)/Rules.make

drivers/ide/arm/Makefile

 
-O_TARGET := idedriver-arm.o
-
-obj-y		:=
-obj-m		:=
-
 obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)	+= icside.o
 obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)	+= rapide.o
 

drivers/ide/legacy/Makefile

 
-O_TARGET := idedriver-legacy.o
-
-obj-y		:=
-obj-m		:=
-
 obj-$(CONFIG_BLK_DEV_ALI14XX)		+= ali14xx.o
 obj-$(CONFIG_BLK_DEV_DTC2278)		+= dtc2278.o
 obj-$(CONFIG_BLK_DEV_HT6560B)		+= ht6560b.o

drivers/ide/pci/Makefile

 
-O_TARGET := idedriver-pci.o
-
-obj-y		:=
-obj-m		:=
-
 obj-$(CONFIG_BLK_DEV_ADMA100)		+= adma100.o
 obj-$(CONFIG_BLK_DEV_AEC62XX)		+= aec62xx.o
 obj-$(CONFIG_BLK_DEV_ALI15X3)		+= alim15x3.o

drivers/ide/ppc/Makefile

 
-O_TARGET := idedriver-ppc.o
-
-obj-y		:=
-obj-m		:=
-
 obj-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= mpc8xx.o
 obj-$(CONFIG_BLK_DEV_IDE_PMAC)		+= pmac.o
 obj-$(CONFIG_BLK_DEV_IDE_SWARM)		+= swarm.o

drivers/ieee1394/Makefile

@@ -2,11 +2,8 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
 
-O_TARGET := ieee1394drv.o
-
 export-objs := ieee1394_core.o ohci1394.o cmp.o
 
-list-multi := ieee1394.o
 ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
 		 highlevel.o csr.o nodemgr.o
 
@@ -22,6 +19,3 @@ obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o
 obj-$(CONFIG_IEEE1394_CMP) += cmp.o
 
 include $(TOPDIR)/Rules.make
-
-ieee1394.o: $(ieee1394-objs)
-	$(LD) $(LDFLAGS) -r -o $@ $(ieee1394-objs)

drivers/message/fusion/Makefile

 #
 # 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
 
@@ -53,27 +46,11 @@ EXTRA_CFLAGS += -I. ${MPT_CFLAGS}
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
-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
-
-
-#  EXP...
-## Fusion MPT extra's...
-##mptscsih.o: $(mptscsih-objs)
-##	$(LD) -r -o $@ $(mptscsih-objs)