Remove list-multi in drivers/net/*/Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ba862018f2a299c6b3f0c1d0afae73558e0f0ecd..923ee83dbd434d6560f90ad80acc4df4edf54a87 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,7 +18,6 @@ O_TARGET := net.o
 export-objs     :=     8390.o arlan.o aironet4500_core.o aironet4500_card.o \
                        ppp_async.o ppp_generic.o slhc.o pppox.o auto_irq.o \
                        net_init.o mii.o
-list-multi     :=      rcpci.o
 rcpci-objs     :=      rcpci45.o rclanmtl.o
 
 ifeq ($(CONFIG_E100),y)
@@ -236,7 +235,3 @@ include $(TOPDIR)/Rules.make
 
 clean:
        rm -f core *.o *.a *.s
-
-rcpci.o: $(rcpci-objs)
-       $(LD) -r -o $@ $(rcpci-objs)
-

diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index 2257b022b4bb4f4e5af8826da5b208a5f43d7ec1..abbcef43fa9d9dad41b1077067813b901686614c 100644 (file)
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -23,14 +23,9 @@ obj-$(CONFIG_TULIP)          += tulip.o
 obj-$(CONFIG_DE4X5)            += de4x5.o
 
 # Declare multi-part drivers.
-list-multi                     := tulip.o
 
 tulip-objs                     := eeprom.o interrupt.o media.o \
                                   timer.o tulip_core.o         \
                                   21142.o pnic.o pnic2.o
 
 include $(TOPDIR)/Rules.make
-
-# Link rules for multi-part drivers.
-tulip.o: $(tulip-objs)
-       $(LD) -r -o $@ $(tulip-objs)

diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index fcfbff9e1df8ce52f759cf07d81bf7f05ae51450..75ba01998d4e181e39b35ae9ce4d0b335e9b8a14 100644 (file)
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -5,28 +5,29 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-SUB_DIRS     := 
-
 O_TARGET := wan.o
 
-export-objs =  z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o
-list-multi =   wanpipe.o cyclomx.o
+export-objs := z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o
 
-wanpipe-objs = sdlamain.o sdla_ft1.o $(wanpipe-y)
+wanpipe-y                      := sdlamain.o sdla_ft1.o
 wanpipe-$(CONFIG_WANPIPE_X25)  += sdla_x25.o
 wanpipe-$(CONFIG_WANPIPE_FR)   += sdla_fr.o
 wanpipe-$(CONFIG_WANPIPE_CHDLC)        += sdla_chdlc.o
 wanpipe-$(CONFIG_WANPIPE_PPP)  += sdla_ppp.o
 wanpipe-$(CONFIG_WANPIPE_MULTPPP) += wanpipe_multppp.o
+wanpipe-objs                   := $(wanpipe-y)
 
-cyclomx-objs = cycx_main.o $(cyclomx-y)  
+cyclomx-y                       := cycx_main.o
 cyclomx-$(CONFIG_CYCLOMX_X25)  += cycx_x25.o
+cyclomx-objs                   := $(cyclomx-y)  
 
+hdlc-y                         := hdlc_generic.o
 hdlc-$(CONFIG_HDLC_RAW)                += hdlc_raw.o
 hdlc-$(CONFIG_HDLC_CISCO)      += hdlc_cisco.o
 hdlc-$(CONFIG_HDLC_FR)         += hdlc_fr.o
 hdlc-$(CONFIG_HDLC_PPP)                += hdlc_ppp.o
 hdlc-$(CONFIG_HDLC_X25)                += hdlc_x25.o
+hdlc-objs                      := $(hdlc-y)
 
 obj-$(CONFIG_HOSTESS_SV11)     += z85230.o     syncppp.o       hostess_sv11.o
 obj-$(CONFIG_SEALEVEL_4021)    += z85230.o     syncppp.o       sealevel.o
@@ -69,13 +70,3 @@ obj-$(CONFIG_N2)             += n2.o
 obj-$(CONFIG_C101)             += c101.o
 
 include $(TOPDIR)/Rules.make
-
-hdlc.o: hdlc_generic.o $(hdlc-y)
-       $(LD) -r -o $@ hdlc_generic.o $(hdlc-y)
-
-wanpipe.o: $(wanpipe-objs)
-       $(LD) -r -o $@ $(wanpipe-objs)
-
-cyclomx.o: $(cyclomx-objs)
-       $(LD) -r -o $@ $(cyclomx-objs)
-