From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:02:29 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch dm9000
X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~51443^2~21^2~231^2~11
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=79121839aad7153907b92462759675266f1f2ac4;hp=-c

Merge ... /spare/repo/netdev-2.6 branch dm9000
---

79121839aad7153907b92462759675266f1f2ac4
diff --combined drivers/net/Kconfig
index f08e01b2fd1,4d0c1fb15c7..cebee528f3c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -824,6 -824,18 +824,18 @@@ config SMC919
  	  <file:Documentation/networking/net-modules.txt>. The module
  	  will be called smc9194.
  
+ config DM9000
+ 	tristate "DM9000 support"
+ 	depends on ARM && NET_ETHERNET
+ 	select CRC32
+ 	select MII
+ 	---help---
+ 	  Support for DM9000 chipset.
+ 
+ 	  To compile this driver as a module, choose M here and read
+ 	  <file:Documentation/networking/net-modules.txt>.  The module will be
+ 	  called dm9000.
+ 
  config NET_VENDOR_RACAL
  	bool "Racal-Interlan (Micom) NI cards"
  	depends on NET_ETHERNET && ISA
@@@ -1555,7 -1567,6 +1567,7 @@@ config SIS90
  	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
  	depends on NET_PCI && PCI
  	select CRC32
 +	select MII
  	---help---
  	  This is a driver for the Fast Ethernet PCI network cards based on
  	  the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
@@@ -2032,15 -2043,6 +2044,15 @@@ config TIGON
  	  To compile this driver as a module, choose M here: the module
  	  will be called tg3.  This is recommended.
  
 +config BNX2
 +	tristate "Broadcom NetXtremeII support"
 +	depends on PCI
 +	help
 +	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
 +
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called bnx2.  This is recommended.
 +
  config GIANFAR
  	tristate "Gianfar Ethernet"
  	depends on 85xx || 83xx
diff --combined drivers/net/Makefile
index 30c7567001f,cbd11688608..0d97be0c77d
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -51,7 -51,6 +51,7 @@@ obj-$(CONFIG_NS83820) += ns83820.
  obj-$(CONFIG_STNIC) += stnic.o 8390.o
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
 +obj-$(CONFIG_BNX2) += bnx2.o
  obj-$(CONFIG_TC35815) += tc35815.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
@@@ -180,6 -179,7 +180,7 @@@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.
  obj-$(CONFIG_IBMVETH) += ibmveth.o
  obj-$(CONFIG_S2IO) += s2io.o
  obj-$(CONFIG_SMC91X) += smc91x.o
+ obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  
  obj-$(CONFIG_ARM) += arm/
@@@ -188,7 -188,7 +189,7 @@@ obj-$(CONFIG_TR) += tokenring
  obj-$(CONFIG_WAN) += wan/
  obj-$(CONFIG_ARCNET) += arcnet/
  obj-$(CONFIG_NET_PCMCIA) += pcmcia/
 -obj-$(CONFIG_NET_WIRELESS) += wireless/
 +obj-$(CONFIG_NET_RADIO) += wireless/
  obj-$(CONFIG_NET_TULIP) += tulip/
  obj-$(CONFIG_HAMRADIO) += hamradio/
  obj-$(CONFIG_IRDA) += irda/