Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize (628a6048) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+29 −37

Original line number	Diff line number	Diff line
		@@ -117,20 +117,20 @@ Maintainers List (try to look for most precise areas first)
		M: Philip Blundell <philb@gnu.org>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/3c505*
		F: drivers/net/ethernet/i825xx/3c505*

		3C59X NETWORK DRIVER
		M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/networking/vortex.txt
		F: drivers/net/3c59x.c
		F: drivers/net/ethernet/3com/3c59x.c

		3CR990 NETWORK DRIVER
		M: David Dillow <dave@thedillows.org>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/typhoon*
		F: drivers/net/ethernet/3com/typhoon*

		3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
		M: Adam Radford <linuxraid@lsi.com>
		@@ -170,8 +170,7 @@ F: include/linux/serial_8250.h
		8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
		L: netdev@vger.kernel.org
		S: Orphan / Obsolete
		F: drivers/net/8390
		F: drivers/net/ax88796.c
		F: drivers/net/ethernet/8390/

		9P FILE SYSTEM
		M: Eric Van Hensbergen <ericvh@gmail.com>
		@@ -214,7 +213,7 @@ ACENIC DRIVER
		M: Jes Sorensen <jes@trained-monkey.org>
		L: linux-acenic@sunsite.dk
		S: Maintained
		F: drivers/net/acenic*
		F: drivers/net/ethernet/3com/acenic*

		ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
		M: Peter Feuerer <peter@piie.net>
		@@ -746,7 +745,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		W: http://www.arm.linux.org.uk/
		S: Maintained
		F: arch/arm/mach-ebsa110/
		F: drivers/net/arm/am79c961a.*
		F: drivers/net/ethernet/amd/am79c961a.*

		ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
		M: Daniel Ribeiro <drwyrm@gmail.com>
		@@ -1015,7 +1014,7 @@ F: arch/arm/include/asm/hardware/ioc.h
		F: arch/arm/include/asm/hardware/iomd.h
		F: arch/arm/include/asm/hardware/memc.h
		F: arch/arm/mach-rpc/
		F: drivers/net/arm/ether*
		F: drivers/net/arm/ether3*
		F: drivers/scsi/arm/

		ARM/SHARK MACHINE SUPPORT
		@@ -1527,27 +1526,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER
		M: Gary Zambrano <zambrano@broadcom.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/b44.*
		F: drivers/net/ethernet/broadcom/b44.*

		BROADCOM BNX2 GIGABIT ETHERNET DRIVER
		M: Michael Chan <mchan@broadcom.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/bnx2.*
		F: drivers/net/bnx2_*
		F: drivers/net/ethernet/broadcom/bnx2.*
		F: drivers/net/ethernet/broadcom/bnx2_*

		BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
		M: Eilon Greenstein <eilong@broadcom.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/bnx2x/
		F: drivers/net/ethernet/broadcom/bnx2x/

		BROADCOM TG3 GIGABIT ETHERNET DRIVER
		M: Matt Carlson <mcarlson@broadcom.com>
		M: Michael Chan <mchan@broadcom.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/tg3.*
		F: drivers/net/ethernet/broadcom/tg3.*

		BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
		M: Brett Rudley <brudley@broadcom.com>
		@@ -1995,7 +1994,7 @@ M: Divy Le Ray <divy@chelsio.com>
		L: netdev@vger.kernel.org
		W: http://www.chelsio.com
		S: Supported
		F: drivers/net/cxgb3/
		F: drivers/net/ethernet/chelsio/cxgb3/

		CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
		M: Steve Wise <swise@chelsio.com>
		@@ -2009,7 +2008,7 @@ M: Dimitris Michailidis <dm@chelsio.com>
		L: netdev@vger.kernel.org
		W: http://www.chelsio.com
		S: Supported
		F: drivers/net/cxgb4/
		F: drivers/net/ethernet/chelsio/cxgb4/

		CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
		M: Steve Wise <swise@chelsio.com>
		@@ -2023,7 +2022,7 @@ M: Casey Leedom <leedom@chelsio.com>
		L: netdev@vger.kernel.org
		W: http://www.chelsio.com
		S: Supported
		F: drivers/net/cxgb4vf/
		F: drivers/net/ethernet/chelsio/cxgb4vf/

		STMMAC ETHERNET DRIVER
		M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
		@@ -2511,7 +2510,7 @@ ETHEREXPRESS-16 NETWORK DRIVER
		M: Philip Blundell <philb@gnu.org>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/eexpress.*
		F: drivers/net/ethernet/i825xx/eexpress.*

		ETHERNET BRIDGE
		M: Stephen Hemminger <shemminger@linux-foundation.org>
		@@ -3341,13 +3340,13 @@ M: Bruce Allan <bruce.w.allan@intel.com>
		M: Carolyn Wyborny <carolyn.wyborny@intel.com>
		M: Don Skidmore <donald.c.skidmore@intel.com>
		M: Greg Rose <gregory.v.rose@intel.com>
		M: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
		M: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
		M: Alex Duyck <alexander.h.duyck@intel.com>
		M: John Ronciak <john.ronciak@intel.com>
		L: e1000-devel@lists.sourceforge.net
		W: http://e1000.sourceforge.net/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
		S: Supported
		F: Documentation/networking/e100.txt
		F: Documentation/networking/e1000.txt
		@@ -3357,14 +3356,7 @@ F: Documentation/networking/igbvf.txt
		F: Documentation/networking/ixgb.txt
		F: Documentation/networking/ixgbe.txt
		F: Documentation/networking/ixgbevf.txt
		F: drivers/net/e100.c
		F: drivers/net/e1000/
		F: drivers/net/e1000e/
		F: drivers/net/igb/
		F: drivers/net/igbvf/
		F: drivers/net/ixgb/
		F: drivers/net/ixgbe/
		F: drivers/net/ixgbevf/
		F: drivers/net/ethernet/intel/

		INTEL MRST PMU DRIVER
		M: Len Brown <len.brown@intel.com>
		@@ -4507,7 +4499,7 @@ M: Amit Kumar Salecha <amit.salecha@qlogic.com>
		L: netdev@vger.kernel.org
		W: http://www.qlogic.com
		S: Supported
		F: drivers/net/netxen/
		F: drivers/net/ethernet/qlogic/netxen/

		NFS, SUNRPC, AND LOCKD CLIENTS
		M: Trond Myklebust <Trond.Myklebust@netapp.com>
		@@ -4941,7 +4933,7 @@ PCNET32 NETWORK DRIVER
		M: Don Fry <pcnet32@frontier.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/pcnet32.c
		F: drivers/net/ethernet/amd/pcnet32.c

		PCRYPT PARALLEL CRYPTO ENGINE
		M: Steffen Klassert <steffen.klassert@secunet.com>
		@@ -5253,7 +5245,7 @@ M: linux-driver@qlogic.com
		L: netdev@vger.kernel.org
		S: Supported
		F: Documentation/networking/LICENSE.qla3xxx
		F: drivers/net/qla3xxx.*
		F: drivers/net/ethernet/qlogic/qla3xxx.*

		QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
		M: Amit Kumar Salecha <amit.salecha@qlogic.com>
		@@ -5261,7 +5253,7 @@ M: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
		M: linux-driver@qlogic.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/qlcnic/
		F: drivers/net/ethernet/qlogic/qlcnic/

		QLOGIC QLGE 10Gb ETHERNET DRIVER
		M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
		@@ -5269,7 +5261,7 @@ M: Ron Mercer <ron.mercer@qlogic.com>
		M: linux-driver@qlogic.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/qlge/
		F: drivers/net/ethernet/qlogic/qlge/

		QNX4 FILESYSTEM
		M: Anders Larsen <al@alarsen.net>
		@@ -5877,7 +5869,7 @@ F: mm/sl?b.c
		SMC91x ETHERNET DRIVER
		M: Nicolas Pitre <nico@fluxnic.net>
		S: Odd Fixes
		F: drivers/net/smc91x.*
		F: drivers/net/ethernet/smsc/smc91x.*

		SMM665 HARDWARE MONITOR DRIVER
		M: Guenter Roeck <linux@roeck-us.net>
		@@ -5912,13 +5904,13 @@ M: Steve Glendinning <steve.glendinning@smsc.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: include/linux/smsc911x.h
		F: drivers/net/smsc911x.*
		F: drivers/net/ethernet/smsc/smsc911x.*

		SMSC9420 PCI ETHERNET DRIVER
		M: Steve Glendinning <steve.glendinning@smsc.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/smsc9420.*
		F: drivers/net/ethernet/smsc/smsc9420.*

		SN-IA64 (Itanium) SUB-PLATFORM
		M: Jes Sorensen <jes@sgi.com>
		@@ -6568,7 +6560,7 @@ W: http://uclinux-h8.sourceforge.jp/
		S: Supported
		F: arch/h8300/
		F: drivers/ide/ide-h8300.c
		F: drivers/net/ne-h8300.c
		F: drivers/net/ethernet/8390/ne-h8300.c

		UDF FILESYSTEM
		M: Jan Kara <jack@suse.cz>

drivers/infiniband/hw/cxgb3/Makefile

+1 −1

Original line number	Diff line number	Diff line
		ccflags-y := -Idrivers/net/cxgb3
		ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3

		obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o

drivers/infiniband/hw/cxgb4/Makefile

+1 −1

Original line number	Diff line number	Diff line
		ccflags-y := -Idrivers/net/cxgb4
		ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4

		obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o

drivers/net/Kconfig

+7 −1242

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/Makefile

+2 −90

Original line number	Diff line number	Diff line
		#
		# Makefile for the Linux network (ethercard) device drivers.
		# Makefile for the Linux network device drivers.
		#

		obj-$(CONFIG_MII) += mii.o
		@@ -10,19 +10,8 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
		obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
		obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o

		obj-$(CONFIG_E1000) += e1000/
		obj-$(CONFIG_E1000E) += e1000e/
		obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
		obj-$(CONFIG_IGB) += igb/
		obj-$(CONFIG_IGBVF) += igbvf/
		obj-$(CONFIG_IXGBE) += ixgbe/
		obj-$(CONFIG_IXGBEVF) += ixgbevf/
		obj-$(CONFIG_IXGB) += ixgb/
		obj-$(CONFIG_IP1000) += ipg.o
		obj-$(CONFIG_CHELSIO_T1) += chelsio/
		obj-$(CONFIG_CHELSIO_T3) += cxgb3/
		obj-$(CONFIG_CHELSIO_T4) += cxgb4/
		obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
		obj-$(CONFIG_EHEA) += ehea/
		obj-$(CONFIG_CAN) += can/
		obj-$(CONFIG_BONDING) += bonding/
		@@ -56,7 +45,6 @@ obj-$(CONFIG_PLIP) += plip.o
		obj-$(CONFIG_ROADRUNNER) += rrunner.o

		obj-$(CONFIG_HAPPYMEAL) += sunhme.o
		obj-$(CONFIG_SUNLANCE) += sunlance.o
		obj-$(CONFIG_SUNQE) += sunqe.o
		obj-$(CONFIG_SUNBMAC) += sunbmac.o
		obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
		@@ -66,28 +54,15 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
		obj-$(CONFIG_MACE) += mace.o
		obj-$(CONFIG_BMAC) += bmac.o

		obj-$(CONFIG_VORTEX) += 3c59x.o
		obj-$(CONFIG_TYPHOON) += typhoon.o
		obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
		obj-$(CONFIG_PCNET32) += pcnet32.o
		obj-$(CONFIG_E100) += e100.o
		obj-$(CONFIG_TLAN) += tlan.o
		obj-$(CONFIG_EPIC100) += epic100.o
		obj-$(CONFIG_SMSC9420) += smsc9420.o
		obj-$(CONFIG_SIS190) += sis190.o
		obj-$(CONFIG_SIS900) += sis900.o
		obj-$(CONFIG_R6040) += r6040.o
		obj-$(CONFIG_YELLOWFIN) += yellowfin.o
		obj-$(CONFIG_ACENIC) += acenic.o
		obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
		obj-$(CONFIG_NATSEMI) += natsemi.o
		obj-$(CONFIG_NS83820) += ns83820.o
		obj-$(CONFIG_STNIC) += stnic.o 8390.o
		obj-$(CONFIG_FEALNX) += fealnx.o
		obj-$(CONFIG_TIGON3) += tg3.o
		obj-$(CONFIG_BNX2) += bnx2.o
		obj-$(CONFIG_CNIC) += cnic.o
		obj-$(CONFIG_BNX2X) += bnx2x/
		spidernet-y += spider_net.o spider_net_ethtool.o
		obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
		obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
		@@ -117,35 +92,13 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
		obj-$(CONFIG_NET) += Space.o loopback.o
		obj-$(CONFIG_SEEQ8005) += seeq8005.o
		obj-$(CONFIG_NET_SB1000) += sb1000.o
		obj-$(CONFIG_MAC8390) += mac8390.o
		obj-$(CONFIG_APNE) += apne.o 8390.o
		obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
		obj-$(CONFIG_HP100) += hp100.o
		obj-$(CONFIG_SMC9194) += smc9194.o
		obj-$(CONFIG_FEC) += fec.o
		obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
		ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
		obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
		endif
		obj-$(CONFIG_WD80x3) += wd.o 8390.o
		obj-$(CONFIG_EL2) += 3c503.o 8390p.o
		obj-$(CONFIG_NE2000) += ne.o 8390p.o
		obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
		obj-$(CONFIG_HPLAN) += hp.o 8390p.o
		obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
		obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
		obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
		obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
		obj-$(CONFIG_E2100) += e2100.o 8390.o
		obj-$(CONFIG_ES3210) += es3210.o 8390.o
		obj-$(CONFIG_LNE390) += lne390.o 8390.o
		obj-$(CONFIG_NE3210) += ne3210.o 8390.o
		obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
		obj-$(CONFIG_B44) += b44.o
		obj-$(CONFIG_FORCEDETH) += forcedeth.o
		obj-$(CONFIG_NE_H8300) += ne-h8300.o
		obj-$(CONFIG_AX88796) += ax88796.o
		obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
		obj-$(CONFIG_FTGMAC100) += ftgmac100.o
		obj-$(CONFIG_FTMAC100) += ftmac100.o

		@@ -154,9 +107,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
		ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
		obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
		obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
		obj-$(CONFIG_QLA3XXX) += qla3xxx.o
		obj-$(CONFIG_QLCNIC) += qlcnic/
		obj-$(CONFIG_QLGE) += qlge/

		obj-$(CONFIG_PPP) += ppp_generic.o
		obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
		@@ -180,59 +130,25 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
		obj-$(CONFIG_MACVTAP) += macvtap.o
		obj-$(CONFIG_DE600) += de600.o
		obj-$(CONFIG_DE620) += de620.o
		obj-$(CONFIG_LANCE) += lance.o
		obj-$(CONFIG_SUN3_82586) += sun3_82586.o
		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_EL1) += 3c501.o
		obj-$(CONFIG_EL16) += 3c507.o
		obj-$(CONFIG_ELMC) += 3c523.o
		obj-$(CONFIG_IBMLANA) += ibmlana.o
		obj-$(CONFIG_ELMC_II) += 3c527.o
		obj-$(CONFIG_EL3) += 3c509.o
		obj-$(CONFIG_3C515) += 3c515.o
		obj-$(CONFIG_EEXPRESS) += eexpress.o
		obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
		obj-$(CONFIG_8139CP) += 8139cp.o
		obj-$(CONFIG_8139TOO) += 8139too.o
		obj-$(CONFIG_ZNET) += znet.o
		obj-$(CONFIG_CPMAC) += cpmac.o
		obj-$(CONFIG_DEPCA) += depca.o
		obj-$(CONFIG_EWRK3) += ewrk3.o
		obj-$(CONFIG_ATP) += atp.o
		obj-$(CONFIG_NI5010) += ni5010.o
		obj-$(CONFIG_NI52) += ni52.o
		obj-$(CONFIG_NI65) += ni65.o
		obj-$(CONFIG_ELPLUS) += 3c505.o
		obj-$(CONFIG_AC3200) += ac3200.o 8390.o
		obj-$(CONFIG_APRICOT) += 82596.o
		obj-$(CONFIG_LASI_82596) += lasi_82596.o
		obj-$(CONFIG_SNI_82596) += sni_82596.o
		obj-$(CONFIG_MVME16x_NET) += 82596.o
		obj-$(CONFIG_BVME6000_NET) += 82596.o
		obj-$(CONFIG_SC92031) += sc92031.o

		# This is also a 82596 and should probably be merged
		obj-$(CONFIG_LP486E) += lp486e.o

		obj-$(CONFIG_ETH16I) += eth16i.o
		obj-$(CONFIG_ZORRO8390) += zorro8390.o
		obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
		obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
		obj-$(CONFIG_EQUALIZER) += eql.o
		obj-$(CONFIG_KORINA) += korina.o
		obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
		obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
		obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
		obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
		obj-$(CONFIG_DECLANCE) += declance.o
		obj-$(CONFIG_ATARILANCE) += atarilance.o
		obj-$(CONFIG_A2065) += a2065.o
		obj-$(CONFIG_HYDRA) += hydra.o
		obj-$(CONFIG_ARIADNE) += ariadne.o
		obj-$(CONFIG_CS89x0) += cs89x0.o
		obj-$(CONFIG_MACSONIC) += macsonic.o
		obj-$(CONFIG_MACMACE) += macmace.o
		@@ -242,14 +158,10 @@ obj-$(CONFIG_VETH) += veth.o
		obj-$(CONFIG_NET_NETX) += netx-eth.o
		obj-$(CONFIG_DL2K) += dl2k.o
		obj-$(CONFIG_R8169) += r8169.o
		obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
		obj-$(CONFIG_IBMVETH) += ibmveth.o
		obj-$(CONFIG_S2IO) += s2io.o
		obj-$(CONFIG_VXGE) += vxge/
		obj-$(CONFIG_MYRI10GE) += myri10ge/
		obj-$(CONFIG_SMC91X) += smc91x.o
		obj-$(CONFIG_SMC911X) += smc911x.o
		obj-$(CONFIG_SMSC911X) += smsc911x.o
		obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
		obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
		obj-$(CONFIG_DM9000) += dm9000.o
		@@ -269,6 +181,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o

		obj-$(CONFIG_ARM) += arm/
		obj-$(CONFIG_DEV_APPLETALK) += appletalk/
		obj-$(CONFIG_ETHERNET) += ethernet/
		obj-$(CONFIG_TR) += tokenring/
		obj-$(CONFIG_WAN) += wan/
		obj-$(CONFIG_ARCNET) += arcnet/
		@@ -295,7 +208,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o

		obj-$(CONFIG_FS_ENET) += fs_enet/

		obj-$(CONFIG_NETXEN_NIC) += netxen/
		obj-$(CONFIG_NIU) += niu.o
		obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
		obj-$(CONFIG_SFC) += sfc/