Commit dee1ad47 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

intel: Move the Intel wired LAN drivers 



Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f7917c00

MAINTAINERS

+4 −11
Original line number Diff line number Diff line
@@ -3340,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
@@ -3356,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>

drivers/net/Kconfig

+0 −200
Original line number Diff line number Diff line
@@ -1032,32 +1032,6 @@ config TC35815 
	depends on NET_PCI && PCI && MIPS

	select PHYLIB



config E100

	tristate "Intel(R) PRO/100+ support"

	depends on NET_PCI && PCI

	select MII

	---help---

	  This driver supports Intel(R) PRO/100 family of adapters.

	  To verify that your adapter is supported, find the board ID number 

	  on the adapter. Look for a label that has a barcode and a number 

	  in the format 123456-001 (six digits hyphen three digits). 



	  Use the above information and the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  to identify the adapter.



	  For the latest Intel PRO/100 network driver for Linux, see:



	  <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>



	  More specific information on configuring the driver is in 

	  <file:Documentation/networking/e100.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called e100.



config FEALNX

	tristate "Myson MTD-8xx PCI Ethernet support"

	depends on NET_PCI && PCI
@@ -1490,47 +1464,6 @@ config DL2K 
	  To compile this driver as a module, choose M here: the

	  module will be called dl2k.



config E1000

	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"

	depends on PCI

	---help---

	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of

	  adapters.  For more information on how to identify your adapter, go 

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  More specific information on configuring the driver is in 

	  <file:Documentation/networking/e1000.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called e1000.



config E1000E

	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"

	depends on PCI && (!SPARC32 || BROKEN)

	select CRC32

	---help---

	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit

	  ethernet family of adapters. For PCI or PCI-X e1000 adapters,

	  use the regular e1000 driver For more information on how to

	  identify your adapter, go to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  To compile this driver as a module, choose M here. The module

	  will be called e1000e.



config IP1000

	tristate "IP1000 Gigabit Ethernet support"

	depends on PCI && EXPERIMENTAL
@@ -1541,57 +1474,6 @@ config IP1000 
	  To compile this driver as a module, choose M here: the module

	  will be called ipg.  This is recommended.



config IGB

	tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"

	depends on PCI

	---help---

	  This driver supports Intel(R) 82575/82576 gigabit ethernet family of

	  adapters.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/e1000.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called igb.



config IGB_DCA

	bool "Direct Cache Access (DCA) Support"

	default y

	depends on IGB && DCA && !(IGB=y && DCA=m)

	---help---

	  Say Y here if you want to use Direct Cache Access (DCA) in the

	  driver.  DCA is a method for warming the CPU cache before data

	  is used, with the intent of lessening the impact of cache misses.



config IGBVF

	tristate "Intel(R) 82576 Virtual Function Ethernet support"

	depends on PCI

	---help---

	  This driver supports Intel(R) 82576 virtual functions.  For more

	  information on how to identify your adapter, go to the Adapter &

	  Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/e1000.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called igbvf.



source "drivers/net/ixp2000/Kconfig"



config NS83820
@@ -1958,88 +1840,6 @@ config ENIC 
	help

	  This enables the support for the Cisco VIC Ethernet card.



config IXGBE

	tristate "Intel(R) 10GbE PCI Express adapters support"

	depends on PCI && INET

	select MDIO

	---help---

	  This driver supports Intel(R) 10GbE PCI Express family of

	  adapters.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  To compile this driver as a module, choose M here. The module

	  will be called ixgbe.



config IXGBE_DCA

	bool "Direct Cache Access (DCA) Support"

	default y

	depends on IXGBE && DCA && !(IXGBE=y && DCA=m)

	---help---

	  Say Y here if you want to use Direct Cache Access (DCA) in the

	  driver.  DCA is a method for warming the CPU cache before data

	  is used, with the intent of lessening the impact of cache misses.



config IXGBE_DCB

	bool "Data Center Bridging (DCB) Support"

	default n

	depends on IXGBE && DCB

	---help---

	  Say Y here if you want to use Data Center Bridging (DCB) in the

	  driver.



	  If unsure, say N.



config IXGBEVF

	tristate "Intel(R) 82599 Virtual Function Ethernet support"

	depends on PCI_MSI

	---help---

	  This driver supports Intel(R) 82599 virtual functions.  For more

	  information on how to identify your adapter, go to the Adapter &

	  Driver ID Guide at:



	  <http://support.intel.com/support/network/sb/CS-008441.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/ixgbevf.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called ixgbevf.  MSI-X interrupt support is required

	  for this driver to work correctly.



config IXGB

	tristate "Intel(R) PRO/10GbE support"

	depends on PCI

	---help---

	  This driver supports Intel(R) PRO/10GbE family of adapters for

	  PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver

	  instead. For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:



	  <http://support.intel.com>



	  More specific information on configuring the driver is in 

	  <file:Documentation/networking/ixgb.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called ixgb.



config S2IO

	tristate "Exar Xframe 10Gb Ethernet Adapter"

	depends on PCI

drivers/net/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -10,14 +10,7 @@ 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_EHEA) += ehea/

obj-$(CONFIG_CAN) += can/
@@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o 
obj-$(CONFIG_MACE) += mace.o

obj-$(CONFIG_BMAC) += bmac.o



obj-$(CONFIG_E100) += e100.o

obj-$(CONFIG_TLAN) += tlan.o

obj-$(CONFIG_EPIC100) += epic100.o

obj-$(CONFIG_SMSC9420) += smsc9420.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ source "drivers/net/ethernet/8390/Kconfig" 
source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

source "drivers/net/ethernet/intel/Kconfig"



endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 
obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/