diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-04-07 07:42:33 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-10 20:03:27 -0700 |
commit | dee1ad47f2ee75f5146d83ca757c1b7861c34c3b (patch) | |
tree | 47cbdefe3d0f9b729724e378ad6a96eaddfd5fbc | |
parent | f7917c009c28c941ba151ee66f04dc7f6a2e1e0b (diff) |
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | MAINTAINERS | 15 | ||||
-rw-r--r-- | drivers/net/Kconfig | 200 | ||||
-rw-r--r-- | drivers/net/Makefile | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/Kconfig | 220 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/Makefile | 12 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e100.c (renamed from drivers/net/e100.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/Makefile (renamed from drivers/net/e1000/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000.h (renamed from drivers/net/e1000/e1000.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c (renamed from drivers/net/e1000/e1000_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_hw.c (renamed from drivers/net/e1000/e1000_hw.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_hw.h (renamed from drivers/net/e1000/e1000_hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c (renamed from drivers/net/e1000/e1000_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_osdep.h (renamed from drivers/net/e1000/e1000_osdep.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_param.c (renamed from drivers/net/e1000/e1000_param.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c (renamed from drivers/net/e1000e/es2lan.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/82571.c (renamed from drivers/net/e1000e/82571.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/Makefile (renamed from drivers/net/e1000e/Makefile) | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/defines.h (renamed from drivers/net/e1000e/defines.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/e1000.h (renamed from drivers/net/e1000e/e1000.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c (renamed from drivers/net/e1000e/ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/hw.h (renamed from drivers/net/e1000e/hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c (renamed from drivers/net/e1000e/ich8lan.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/lib.c (renamed from drivers/net/e1000e/lib.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c (renamed from drivers/net/e1000e/netdev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/param.c (renamed from drivers/net/e1000e/param.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c (renamed from drivers/net/e1000e/phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/Makefile (renamed from drivers/net/igb/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.c (renamed from drivers/net/igb/e1000_82575.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.h (renamed from drivers/net/igb/e1000_82575.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_defines.h (renamed from drivers/net/igb/e1000_defines.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_hw.h (renamed from drivers/net/igb/e1000_hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.c (renamed from drivers/net/igb/e1000_mac.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mac.h (renamed from drivers/net/igb/e1000_mac.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mbx.c (renamed from drivers/net/igb/e1000_mbx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_mbx.h (renamed from drivers/net/igb/e1000_mbx.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_nvm.c (renamed from drivers/net/igb/e1000_nvm.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_nvm.h (renamed from drivers/net/igb/e1000_nvm.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.c (renamed from drivers/net/igb/e1000_phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.h (renamed from drivers/net/igb/e1000_phy.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_regs.h (renamed from drivers/net/igb/e1000_regs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb.h (renamed from drivers/net/igb/igb.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ethtool.c (renamed from drivers/net/igb/igb_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c (renamed from drivers/net/igb/igb_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/Makefile (renamed from drivers/net/igbvf/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/defines.h (renamed from drivers/net/igbvf/defines.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/ethtool.c (renamed from drivers/net/igbvf/ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/igbvf.h (renamed from drivers/net/igbvf/igbvf.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/mbx.c (renamed from drivers/net/igbvf/mbx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/mbx.h (renamed from drivers/net/igbvf/mbx.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/netdev.c (renamed from drivers/net/igbvf/netdev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/regs.h (renamed from drivers/net/igbvf/regs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/vf.c (renamed from drivers/net/igbvf/vf.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/vf.h (renamed from drivers/net/igbvf/vf.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/Makefile (renamed from drivers/net/ixgb/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb.h (renamed from drivers/net/ixgb/ixgb.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_ee.c (renamed from drivers/net/ixgb/ixgb_ee.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_ee.h (renamed from drivers/net/ixgb/ixgb_ee.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c (renamed from drivers/net/ixgb/ixgb_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_hw.c (renamed from drivers/net/ixgb/ixgb_hw.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_hw.h (renamed from drivers/net/ixgb/ixgb_hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_ids.h (renamed from drivers/net/ixgb/ixgb_ids.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c (renamed from drivers/net/ixgb/ixgb_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_osdep.h (renamed from drivers/net/ixgb/ixgb_osdep.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_param.c (renamed from drivers/net/ixgb/ixgb_param.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/Makefile (renamed from drivers/net/ixgbe/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe.h (renamed from drivers/net/ixgbe/ixgbe.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c (renamed from drivers/net/ixgbe/ixgbe_82598.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c (renamed from drivers/net/ixgbe/ixgbe_82599.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c (renamed from drivers/net/ixgbe/ixgbe_common.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.h (renamed from drivers/net/ixgbe/ixgbe_common.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c (renamed from drivers/net/ixgbe/ixgbe_dcb.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h (renamed from drivers/net/ixgbe/ixgbe_dcb.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c (renamed from drivers/net/ixgbe/ixgbe_dcb_82598.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h (renamed from drivers/net/ixgbe/ixgbe_dcb_82598.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c (renamed from drivers/net/ixgbe/ixgbe_dcb_82599.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h (renamed from drivers/net/ixgbe/ixgbe_dcb_82599.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c (renamed from drivers/net/ixgbe/ixgbe_dcb_nl.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c (renamed from drivers/net/ixgbe/ixgbe_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c (renamed from drivers/net/ixgbe/ixgbe_fcoe.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h (renamed from drivers/net/ixgbe/ixgbe_fcoe.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c (renamed from drivers/net/ixgbe/ixgbe_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c (renamed from drivers/net/ixgbe/ixgbe_mbx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h (renamed from drivers/net/ixgbe/ixgbe_mbx.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c (renamed from drivers/net/ixgbe/ixgbe_phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h (renamed from drivers/net/ixgbe/ixgbe_phy.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c (renamed from drivers/net/ixgbe/ixgbe_sriov.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h (renamed from drivers/net/ixgbe/ixgbe_sriov.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_type.h (renamed from drivers/net/ixgbe/ixgbe_type.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c (renamed from drivers/net/ixgbe/ixgbe_x540.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/Makefile (renamed from drivers/net/ixgbevf/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/defines.h (renamed from drivers/net/ixgbevf/defines.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ethtool.c (renamed from drivers/net/ixgbevf/ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf.h (renamed from drivers/net/ixgbevf/ixgbevf.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c (renamed from drivers/net/ixgbevf/ixgbevf_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/mbx.c (renamed from drivers/net/ixgbevf/mbx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/mbx.h (renamed from drivers/net/ixgbevf/mbx.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/regs.h (renamed from drivers/net/ixgbevf/regs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/vf.c (renamed from drivers/net/ixgbevf/vf.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/vf.h (renamed from drivers/net/ixgbevf/vf.h) | 0 |
101 files changed, 239 insertions, 220 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0853d00c7d48..f4838da520c3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 77ab2e189475..e6491169cc6f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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, choos |