kbuild: Remove now redundant 'O_TARGET := built-in.o' lines

(plus a bit of rearranging in the ISDN Makefiles) 

arch/alpha/math-emu/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the FPU instruction emulation.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_MATHEMU) += math-emu.o
 
 math-emu-objs	:= math.o qrnnd.o

drivers/acorn/net/Makefile

@@ -3,13 +3,6 @@
 # Makefile for the Acorn ethercard network device drivers
 #
 
-O_TARGET := built-in.o
-
-obj-y	:=
-obj-m	:=
-obj-n	:=
-obj-	:=
-
 obj-$(CONFIG_ARM_ETHERH)	+= etherh.o
 obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
 obj-$(CONFIG_ARM_ETHER1)	+= ether1.o

drivers/char/ftape/compressor/Makefile

@@ -24,8 +24,6 @@
 #      Linux.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_ZFT_COMPRESSOR) += zft-compressor.o
 
 zft-compressor-objs := zftape-compress.o lzrw3.o

drivers/char/ftape/lowlevel/Makefile

@@ -23,8 +23,6 @@
 #      driver for Linux.
 #
 
-O_TARGET := built-in.o
-
 export-objs := ftape_syms.o
 
 obj-$(CONFIG_FTAPE) += ftape.o

drivers/char/ftape/zftape/Makefile

@@ -27,8 +27,6 @@
 # ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should
 #                leave this enabled for compatibility with taper.
 
-O_TARGET := built-in.o
-
 export-objs := zftape_syms.o
 
 obj-$(CONFIG_ZFTAPE) += zftape.o

drivers/char/mwave/Makefile

@@ -4,8 +4,6 @@
 # See the README file in this directory for more info. <paulsch@us.ibm.com>
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_MWAVE) += mwave.o
 
 mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o

drivers/char/rio/Makefile

@@ -6,8 +6,6 @@
 # This file is GPL. See other files for the full Blurb. I'm lazy today. 
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_RIO) += rio.o
 
 rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \

drivers/isdn/act2000/Makefile

 # Makefile for the act2000 ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000.o
 
 # Multipart objects.
 
 act2000-objs	:= module.o capi.o act2000_isa.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/capi/Makefile

 # Makefile for the CAPI subsystem.
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= kcapi.o capiutil.o capilib.o capifs.o
 
-# Multipart objects.
-
-kernelcapi-objs	:= kcapi.o capiutil.o capilib.o
-
 # Ordering constraints: kernelcapi.o first
 
 # Each configuration option enables a list of files.
@@ -21,6 +13,10 @@ obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
 obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
 
+# Multipart objects.
+
+kernelcapi-objs	:= kcapi.o capiutil.o capilib.o
+
 # The global Rules.make.
 
 include $(TOPDIR)/Rules.make

drivers/isdn/divert/Makefile

-#
 # Makefile for the dss1_divert ISDN module
-#
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DIVERSION)	+= dss1_divert.o
 
 # Multipart objects.
 
 dss1_divert-objs	:= isdn_divert.o divert_procfs.o divert_init.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DIVERSION)	+= dss1_divert.o
-
 include $(TOPDIR)/Rules.make
 
 

drivers/isdn/eicon/Makefile

 # Makefile for the eicon ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= Divas_mod.o eicon_mod.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_DRV_EICON_OLD)    	+= eicon.o
+obj-$(CONFIG_ISDN_DRV_EICON_DIVAS)	+= divas.o
+
 # Multipart objects.
 
 eicon-objs	:= eicon_mod.o eicon_isa.o eicon_pci.o eicon_idi.o \
@@ -23,9 +24,4 @@ eicon-objs-$(CONFIG_ISDN_DRV_EICON_PCI) += common.o idi.o bri.o pri.o log.o \
 
 eicon-objs 	+= $(eicon-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_EICON_OLD)    	+= eicon.o
-obj-$(CONFIG_ISDN_DRV_EICON_DIVAS)	+= divas.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/hardware/Makefile

 # Makefile for the CAPI hardware drivers
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Object files in subdirectories
 
 mod-subdirs			:= avm

drivers/isdn/hardware/avm/Makefile

 # Makefile for the AVM ISDN device drivers
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= b1dma.o b1pcmcia.o b1.o

drivers/isdn/hisax/Makefile

 # Makefile for the hisax ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	  := built-in.o
-
 # Define maximum number of cards
 
 EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
@@ -12,12 +8,22 @@ EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
 
 export-objs	  := config.o fsm.o hisax_isac.o hisax_hscx.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax.o
+obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o
+obj-$(CONFIG_HISAX_ELSA_CS)		+= elsa_cs.o
+obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
+obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
+obj-$(CONFIG_HISAX_FRITZ_CLASSIC)       += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
+obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_hfcpci.o
+
 # Multipart objects.
 
-hisax-objs	  := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
-		     lmgr.o q931.o callc.o fsm.o cert.o
 hisax_st5481-objs := st5481_init.o st5481_usb.o st5481_d.o st5481_b.o \
 		     st5481_hdlc.o
+hisax-objs	  := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \
+		     lmgr.o q931.o callc.o fsm.o cert.o
 
 # Optional parts of multipart objects.
 hisax-objs-$(CONFIG_HISAX_EURO) += l3dss1.o
@@ -55,16 +61,6 @@ hisax-objs-$(CONFIG_HISAX_W6692) += w6692.o
 
 hisax-objs += $(hisax-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax.o
-obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o
-obj-$(CONFIG_HISAX_ELSA_CS)		+= elsa_cs.o
-obj-$(CONFIG_HISAX_ST5481)		+= hisax_st5481.o
-obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_isac.o hisax_fcpcipnp.o
-obj-$(CONFIG_HISAX_FRITZ_CLASSIC)       += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
-obj-$(CONFIG_HISAX_FRITZ_PCIPNP)        += hisax_hfcpci.o
-
 CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
 CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
 

drivers/isdn/hysdn/Makefile

 # Makefile for the hysdn ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_HYSDN)	+= hysdn.o
 
 # Multipart objects.
 
@@ -15,8 +15,4 @@ hysdn-objs-$(CONFIG_HYSDN_CAPI) += hycapi.o
 
 hysdn-objs 	+= $(hysdn-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_HYSDN)	+= hysdn.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/i4l/Makefile

 # Makefile for the kernel ISDN subsystem and device drivers.
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Objects that export symbols.
 
 export-objs	:= isdn_common.o
 
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN)			+= isdn.o
+obj-$(CONFIG_ISDN_PPP_BSDCOMP)		+= isdn_bsdcomp.o
+
 # Multipart objects.
 
-isdn-objs	:= isdn_net.o isdn_tty.o isdn_v110.o isdn_common.o
+isdn-objs				:= isdn_net.o isdn_tty.o \
+					   isdn_v110.o isdn_common.o
 
 # Optional parts of multipart objects.
 
@@ -21,11 +23,4 @@ isdn-objs-$(CONFIG_ISDN_TTY_FAX)	+= isdn_ttyfax.o
 
 isdn-objs				+= $(isdn-objs-y)
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN)			+= isdn.o
-obj-$(CONFIG_ISDN_PPP_BSDCOMP)		+= isdn_bsdcomp.o
-
-# The global Rules.make.
-
 include $(TOPDIR)/Rules.make

drivers/isdn/icn/Makefile

 # Makefile for the icn ISDN device driver
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_ISDN_DRV_ICN)	+= icn.o

drivers/isdn/isdnloop/Makefile

@@ -2,10 +2,6 @@
 # Makefile for the isdnloop ISDN device driver
 #
 
-# The target object and module list name.
-
-O_TARGET	:= built-in.o
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_ISDN_DRV_LOOP)	+= isdnloop.o

drivers/isdn/pcbit/Makefile

 # Makefile for the pcbit ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_PCBIT)	+= pcbit.o
 
 # Multipart objects.
 
 pcbit-objs	:= module.o edss1.o drv.o layer2.o capi.o callbacks.o
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_PCBIT)	+= pcbit.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/sc/Makefile

 # Makefile for the sc ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_SC)	+= sc.o
 
 # Multipart objects.
 
 sc-objs		:= shmem.o init.o debug.o packet.o command.o event.o \
 		   ioctl.o interrupt.o message.o timer.o	
 
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_SC)	+= sc.o
-
 include $(TOPDIR)/Rules.make

drivers/isdn/tpam/Makefile

 # Makefile for the TurboPAM ISDN device driver
 
-# The target object and module list name.
+# Each configuration option enables a list of files.
 
-O_TARGET	:= built-in.o
+obj-$(CONFIG_ISDN_DRV_TPAM)	+= tpam.o
 
 # Multipart objects.
 
-tpam-objs	:= tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o tpam_queues.o tpam_hdlc.o tpam_crcpc.o
-
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_ISDN_DRV_TPAM)	+= tpam.o
+tpam-objs	:= tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o \
+		   tpam_queues.o tpam_hdlc.o tpam_crcpc.o
 
 include $(TOPDIR)/Rules.make

drivers/net/appletalk/Makefile

 #
 # Makefile for drivers/net/appletalk
 #
-# 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).
-#
-
-O_TARGET := built-in.o
 
-obj-y   :=
-obj-n   :=
-obj-m   :=
-obj-    :=
 export-objs :=
 
 obj-$(CONFIG_IPDDP) += ipddp.o

drivers/net/arcnet/Makefile

 # Makefile for linux/drivers/net/arcnet
 #
-# 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).
-#
-
-O_TARGET := built-in.o
 
-obj-y	:=
-obj-n	:=
-obj-m	:=
-obj-	:=
 export-objs := arcnet.o com20020.o
 
 obj-$(CONFIG_ARCNET) += arcnet.o

drivers/net/e100/Makefile

 #
 # Makefile for the Intel's E100 ethernet driver
 #
-# 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...
-
-O_TARGET := built-in.o
 
 obj-$(CONFIG_E100) += e100.o
 

drivers/net/e1000/Makefile

 #
 # Makefile for the Intel(R) PRO/1000 ethernet driver
 #
-# 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...
-
-O_TARGET := built-in.o
 
 obj-$(CONFIG_E1000) += e1000.o
 

drivers/net/fc/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_IPHASE5526)	+= iph5526.o
 
 include $(TOPDIR)/Rules.make

drivers/net/hamradio/Makefile

@@ -10,12 +10,8 @@
 #		Christoph Hellwig <hch@infradead.org>
 #
 
-
-O_TARGET := built-in.o
-
 export-objs	= hdlcdrv.o
 
-
 obj-$(CONFIG_DMASCC)		+= dmascc.o
 obj-$(CONFIG_SCC)		+= scc.o
 obj-$(CONFIG_MKISS)		+= mkiss.o

drivers/net/hamradio/soundmodem/Makefile

 #
 # Makefile for the soundmodem device driver.
 #
-# 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	:= built-in.o
 
 obj-$(CONFIG_SOUNDMODEM) += soundmodem.o
 

drivers/net/irda/Makefile

-# File: drivers/irda/Makefile
 #
 # Makefile for the Linux IrDA infrared port device drivers.
 #
@@ -6,11 +5,8 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 export-objs	= irport.o
 
-
 obj-$(CONFIG_IRTTY_SIR)		+= irtty.o
 obj-$(CONFIG_IRPORT_SIR)	+= 		irport.o
 obj-$(CONFIG_USB_IRDA)		+= irda-usb.o

drivers/net/pcmcia/Makefile

 #
-# drivers/net/pcmcia/Makefile
-#
 # Makefile for the Linux PCMCIA network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 # Things that need to export symbols
 export-objs	:= ray_cs.o
 

drivers/net/sk98lin/Makefile

-# File: drivers/sk98lin/Makefile
 #
 # Makefile for the SysKonnect SK-98xx device driver.
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_SK98LIN) += sk98lin.o
 
 sk98lin-objs := skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \

drivers/net/skfp/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the SysKonnect FDDI PCI adapter driver
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_SKFP) += skfp.o
 
 skfp-objs :=  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \

drivers/net/tokenring/Makefile

 #
 # Makefile for drivers/net/tokenring
 #
-# 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).
-#
-
-O_TARGET := built-in.o
 
-obj-y   :=
-obj-n   :=
-obj-m   :=
-obj-    :=
 export-objs := tms380tr.o
 
 obj-$(CONFIG_IBMTR) 	+= ibmtr.o

drivers/net/tulip/Makefile

 #
-# drivers/net/tulip/Makefile
-#
 # Makefile for the Linux "Tulip" family network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-# Things that need to export symbols
-export-objs	:=
-
 obj-$(CONFIG_PCMCIA_XIRTULIP)	+= xircom_tulip_cb.o
 obj-$(CONFIG_PCMCIA_XIRCOM)	+= xircom_cb.o
 obj-$(CONFIG_DM9102)		+= dmfe.o

drivers/net/wan/Makefile

@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-O_TARGET := built-in.o
-
 export-objs :=	z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o \
 		dlci.o pc300_drv.o
 

drivers/net/wan/lmc/Makefile

-# File: drivers/lmc/Makefile
 #
 # Makefile for the Lan Media 21140 based WAN cards
 # Specifically the 1000,1200,5200,5245
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_LANMEDIA) += lmc.o
 
 lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o

drivers/net/wireless/Makefile

 #
-# drivers/net/wireless/Makefile
-#
 # Makefile for the Linux Wireless network device drivers.
 #
 
-O_TARGET := built-in.o
-
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
 # Things that need to export symbols
 export-objs	:= airo.o orinoco.o hermes.o
 

drivers/video/aty/Makefile

 
-O_TARGET := built-in.o
-
 export-objs    :=  atyfb_base.o mach64_accel.o
 
 obj-$(CONFIG_FB_ATY) += atyfb.o

drivers/video/matrox/Makefile

@@ -2,8 +2,6 @@
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
 # Rewritten to use lists instead of if-statements.
 
-O_TARGET := built-in.o
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 

drivers/video/riva/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Riva framebuffer driver
 #
 
-O_TARGET := built-in.o
-
 obj-$(CONFIG_FB_RIVA) += rivafb.o
 
 rivafb-objs := fbdev.o riva_hw.o accel.o

drivers/video/sis/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the SiS framebuffer device driver
 #
 
-O_TARGET := built-in.o
-
 export-objs := sis_main.o
 
 obj-$(CONFIG_FB_SIS) += sisfb.o