ISDN: Use 'built-in.o' instead of 'vmlinux-obj.o' as O_TARGET

drivers/isdn/Makefile

@@ -7,21 +7,20 @@ O_TARGET	:= vmlinux-obj.o
 # Object files in subdirectories
 
 mod-subdirs				:= i4l hisax capi eicon
-subdir-$(CONFIG_ISDN)			+= i4l
-subdir-$(CONFIG_ISDN_CAPI)		+= capi
-subdir-$(CONFIG_ISDN_CAPI)		+= hardware
-subdir-$(CONFIG_ISDN_DIVERSION)		+= divert
-subdir-$(CONFIG_ISDN_DRV_HISAX)		+= hisax
-subdir-$(CONFIG_ISDN_DRV_ICN)		+= icn
-subdir-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit
-subdir-$(CONFIG_ISDN_DRV_SC)		+= sc
-subdir-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop
-subdir-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000
-subdir-$(CONFIG_ISDN_DRV_EICON)		+= eicon
-subdir-$(CONFIG_HYSDN)			+= hysdn
-subdir-$(CONFIG_ISDN_DRV_TPAM)		+= tpam
 
-obj-y += $(addsuffix /vmlinux-obj.o, $(subdir-y))
+obj-$(CONFIG_ISDN)			+= i4l/
+obj-$(CONFIG_ISDN_CAPI)			+= capi/
+obj-$(CONFIG_ISDN_CAPI)			+= hardware/
+obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
+obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
+obj-$(CONFIG_ISDN_DRV_ICN)		+= icn/
+obj-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit/
+obj-$(CONFIG_ISDN_DRV_SC)		+= sc/
+obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
+obj-$(CONFIG_ISDN_DRV_ACT2000)		+= act2000/
+obj-$(CONFIG_ISDN_DRV_EICON)		+= eicon/
+obj-$(CONFIG_HYSDN)			+= hysdn/
+obj-$(CONFIG_ISDN_DRV_TPAM)		+= tpam/
 
 # The global Rules.make.
 

drivers/isdn/act2000/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.
 

drivers/isdn/capi/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Objects that export symbols.
 

drivers/isdn/divert/Makefile

@@ -4,7 +4,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.
 

drivers/isdn/eicon/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Objects that export symbols.
 

drivers/isdn/hardware/Makefile

@@ -2,14 +2,12 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Object files in subdirectories
 
-mod-subdirs				:= avm
-subdir-$(CONFIG_CAPI_AVM)		+= avm
-
-obj-y += $(addsuffix /vmlinux-obj.o, $(subdir-y))
+mod-subdirs			:= avm
+obj-$(CONFIG_CAPI_AVM)		+= avm/
 
 # The global Rules.make.
 

drivers/isdn/hardware/avm/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Objects that export symbols.
 

drivers/isdn/hisax/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	  := vmlinux-obj.o
+O_TARGET	  := built-in.o
 
 # Define maximum number of cards
 

drivers/isdn/hysdn/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.
 

drivers/isdn/i4l/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Objects that export symbols.
 
@@ -21,8 +21,6 @@ isdn-objs-$(CONFIG_ISDN_TTY_FAX)	+= isdn_ttyfax.o
 
 isdn-objs				+= $(isdn-objs-y)
 
-# Ordering constraints: isdn.o first, rest doesn't matter
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_ISDN)			+= isdn.o

drivers/isdn/icn/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Each configuration option enables a list of files.
 

drivers/isdn/isdnloop/Makefile

@@ -4,7 +4,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Each configuration option enables a list of files.
 

drivers/isdn/pcbit/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.
 

drivers/isdn/sc/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.
 

drivers/isdn/tpam/Makefile

@@ -2,7 +2,7 @@
 
 # The target object and module list name.
 
-O_TARGET	:= vmlinux-obj.o
+O_TARGET	:= built-in.o
 
 # Multipart objects.