--- zzzz-none-000/linux-2.4.17/drivers/net/Makefile	2001-10-19 15:32:28.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/net/Makefile	2004-11-24 13:23:31.000000000 +0000
@@ -17,7 +17,7 @@
 
 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
+			net_init.o hhnet_eth.o hhnet.o hhnet_dma.o
 list-multi	:=	rcpci.o
 rcpci-objs	:=	rcpci45.o rclanmtl.o
 
@@ -37,11 +37,59 @@
 subdir-$(CONFIG_WAN) += wan
 subdir-$(CONFIG_NET_FC) += fc
 subdir-$(CONFIG_ARCNET) += arcnet
-subdir-$(CONFIG_APPLETALK) += appletalk
+subdir-$(CONFIG_ATALK) += appletalk
 subdir-$(CONFIG_SK98LIN) += sk98lin
 subdir-$(CONFIG_SKFP) += skfp
 
 #
+# Texas Instruments AVALANCHE CPMAC  driver
+#
+
+subdir-$(CONFIG_MIPS_AVALANCHE_CPMAC) += avalanche_cpmac
+#obj-$(CONFIG_MIPS_AVALANCHE_CPMAC) += avalanche_cpmac/avalanche_cpmac.o
+ifeq ($(CONFIG_MIPS_AVALANCHE_CPMAC),y)
+  obj-y += avalanche_cpmac/avalanche_cpmac.o
+endif
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_ESWITCH),y)                              
+obj-$(CONFIG_MIPS_AVALANCHE_ESWITCH) += avalanche_eswitch/avalanche_eswitch.o
+subdir-$(CONFIG_MIPS_AVALANCHE_ESWITCH) += avalanche_eswitch
+endif                                                              
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_ESWITCH),m)                              
+#obj-$(CONFIG_MIPS_AVALANCHE_ESWITCH) += avalanche_eswitch/avalanche_eswitch.o
+subdir-$(CONFIG_MIPS_AVALANCHE_ESWITCH) += avalanche_eswitch
+endif                                                              
+
+
+ 
+#
+# Texas Instruments Avalanche vbus-MAC (vmac) driver
+#
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_VMAC),y)                              
+   obj-$(CONFIG_MIPS_AVALANCHE_VMAC) += avalanche_vmac/avalanche_vmac.o
+   subdir-$(CONFIG_MIPS_AVALANCHE_VMAC) += avalanche_vmac
+endif                                                              
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_VMAC),m)                              
+   subdir-$(CONFIG_MIPS_AVALANCHE_VMAC) += avalanche_vmac
+endif                                                              
+
+#
+# Texas Instruments Avalanche USB Slave Driver.
+#
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_USB),y)
+   obj-$(CONFIG_MIPS_AVALANCHE_USB) += avalanche_usb/avalanche_usb.o
+   subdir-$(CONFIG_MIPS_AVALANCHE_USB) += avalanche_usb
+endif
+
+ifeq ($(CONFIG_MIPS_AVALANCHE_USB),m)
+   subdir-$(CONFIG_MIPS_AVALANCHE_USB) += avalanche_usb
+endif
+
+#
 # link order important here
 #
 obj-$(CONFIG_PLIP) += plip.o
@@ -58,6 +106,7 @@
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 obj-$(CONFIG_GMAC) += gmac.o
+obj-$(CONFIG_NCR885E) += ncr885e.o
 
 obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
 
@@ -78,6 +127,7 @@
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
+obj-$(CONFIG_TC35815) += tc35815.o
 
 ifeq ($(CONFIG_SK98LIN),y)
 obj-y += sk98lin/sk98lin.o
@@ -116,6 +166,7 @@
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
 obj-$(CONFIG_ARM_ETHERH) += 8390.o
+obj-$(CONFIG_CERF_CS8900A) += cerf89x0.o
 obj-$(CONFIG_WD80x3) += wd.o 8390.o
 obj-$(CONFIG_EL2) += 3c503.o 8390.o
 obj-$(CONFIG_NE2000) += ne.o 8390.o
@@ -129,6 +180,10 @@
 obj-$(CONFIG_ES3210) += es3210.o 8390.o
 obj-$(CONFIG_LNE390) += lne390.o 8390.o
 obj-$(CONFIG_NE3210) += ne3210.o 8390.o
+obj-$(CONFIG_GT64260_ETH) += gt64260_eth.o
+obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
+obj-$(CONFIG_HHNET_DMA) += hhnet_dma.o
+obj-$(CONFIG_HHNET) += hhnet_eth.o hhnet.o hhnet_drawb.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
@@ -152,6 +207,7 @@
 obj-$(CONFIG_SUN3LANCE) += sun3lance.o
 obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
+obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_FMV18X) += fmv18x.o
 obj-$(CONFIG_EL1) += 3c501.o
@@ -183,6 +239,7 @@
 obj-$(CONFIG_LASI_82596) += lasi_82596.o
 obj-$(CONFIG_MVME16x_NET) += 82596.o
 obj-$(CONFIG_BVME6000_NET) += 82596.o
+obj-$(CONFIG_PPC405_ENET) += ppc405_enet.o ppc405_phy.o
 
 # This is also a 82596 and should probably be merged
 obj-$(CONFIG_LP486E) += lp486e.o
@@ -209,6 +266,8 @@
 obj-$(CONFIG_MACMACE) += macmace.o
 obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
+obj-$(CONFIG_ETHER00) +=ether00.o
+obj-$(CONFIG_NEC_CANDY) += nec_candy.o
 obj-$(CONFIG_DL2K) += dl2k.o
 
 ifeq ($(CONFIG_ARCH_ACORN),y)
@@ -235,3 +294,6 @@
 rcpci.o: $(rcpci-objs)
 	$(LD) -r -o $@ $(rcpci-objs)
 
+avalanche_vmac.o:	$(avalanche_vmac-objs)
+	$(LD) -r -o $@ $(avalanche_vmac-objs)
+