s2io/vxge: Move the Exar drivers
Move the Exar drivers into drivers/net/ethernet/neterion/ and make the necessary Kconfig and Makefile changes. CC: Jon Mason <jdmason@kudzu.us> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Родитель
93f7848b77
Коммит
86387e1ac4
|
@ -4380,9 +4380,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
|
|||
W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
|
||||
S: Supported
|
||||
F: Documentation/networking/s2io.txt
|
||||
F: drivers/net/s2io*
|
||||
F: Documentation/networking/vxge.txt
|
||||
F: drivers/net/vxge/
|
||||
F: drivers/net/ethernet/neterion/
|
||||
|
||||
NETFILTER/IPTABLES/IPCHAINS
|
||||
P: Rusty Russell
|
||||
|
|
|
@ -1485,40 +1485,6 @@ config ENIC
|
|||
help
|
||||
This enables the support for the Cisco VIC Ethernet card.
|
||||
|
||||
config S2IO
|
||||
tristate "Exar Xframe 10Gb Ethernet Adapter"
|
||||
depends on PCI
|
||||
---help---
|
||||
This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
|
||||
|
||||
More specific information on configuring the driver is in
|
||||
<file:Documentation/networking/s2io.txt>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called s2io.
|
||||
|
||||
config VXGE
|
||||
tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
|
||||
depends on PCI && INET
|
||||
---help---
|
||||
This driver supports Exar Corp's X3100 Series 10 GbE PCIe
|
||||
I/O Virtualized Server Adapter.
|
||||
|
||||
More specific information on configuring the driver is in
|
||||
<file:Documentation/networking/vxge.txt>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called vxge.
|
||||
|
||||
config VXGE_DEBUG_TRACE_ALL
|
||||
bool "Enabling All Debug trace statments in driver"
|
||||
default n
|
||||
depends on VXGE
|
||||
---help---
|
||||
Say Y here if you want to enabling all the debug trace statements in
|
||||
the vxge driver. By default only few debug trace statements are
|
||||
enabled.
|
||||
|
||||
config PASEMI_MAC
|
||||
tristate "PA Semi 1/10Gbit MAC"
|
||||
depends on PPC_PASEMI && PCI && INET
|
||||
|
|
|
@ -149,8 +149,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o
|
|||
obj-$(CONFIG_DL2K) += dl2k.o
|
||||
obj-$(CONFIG_R8169) += r8169.o
|
||||
obj-$(CONFIG_IBMVETH) += ibmveth.o
|
||||
obj-$(CONFIG_S2IO) += s2io.o
|
||||
obj-$(CONFIG_VXGE) += vxge/
|
||||
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
|
||||
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
|
||||
obj-$(CONFIG_DM9000) += dm9000.o
|
||||
|
|
|
@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
|
|||
source "drivers/net/ethernet/brocade/Kconfig"
|
||||
source "drivers/net/ethernet/chelsio/Kconfig"
|
||||
source "drivers/net/ethernet/emulex/Kconfig"
|
||||
source "drivers/net/ethernet/neterion/Kconfig"
|
||||
source "drivers/net/ethernet/intel/Kconfig"
|
||||
source "drivers/net/ethernet/i825xx/Kconfig"
|
||||
source "drivers/net/ethernet/mellanox/Kconfig"
|
||||
|
|
|
@ -9,6 +9,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
|
|||
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
|
||||
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
|
||||
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
|
||||
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
|
||||
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
|
||||
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
|
||||
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
#
|
||||
# Exar device configuration
|
||||
#
|
||||
|
||||
config NET_VENDOR_EXAR
|
||||
bool "Exar devices"
|
||||
depends on PCI
|
||||
---help---
|
||||
If you have a network (Ethernet) card belonging to this class, say
|
||||
Y and read the Ethernet-HOWTO, available from
|
||||
<http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
Note that the answer to this question doesn't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about Exar cards. If you say Y, you will be asked for
|
||||
your specific card in the following questions.
|
||||
|
||||
if NET_VENDOR_EXAR
|
||||
|
||||
config S2IO
|
||||
tristate "Exar Xframe 10Gb Ethernet Adapter"
|
||||
depends on PCI
|
||||
---help---
|
||||
This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
|
||||
|
||||
More specific information on configuring the driver is in
|
||||
<file:Documentation/networking/s2io.txt>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called s2io.
|
||||
|
||||
config VXGE
|
||||
tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
|
||||
depends on PCI && INET
|
||||
---help---
|
||||
This driver supports Exar Corp's X3100 Series 10 GbE PCIe
|
||||
I/O Virtualized Server Adapter.
|
||||
|
||||
More specific information on configuring the driver is in
|
||||
<file:Documentation/networking/vxge.txt>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called vxge.
|
||||
|
||||
config VXGE_DEBUG_TRACE_ALL
|
||||
bool "Enabling All Debug trace statements in driver"
|
||||
default n
|
||||
depends on VXGE
|
||||
---help---
|
||||
Say Y here if you want to enabling all the debug trace statements in
|
||||
the vxge driver. By default only few debug trace statements are
|
||||
enabled.
|
||||
|
||||
endif # NET_VENDOR_EXAR
|
|
@ -0,0 +1,6 @@
|
|||
#
|
||||
# Makefile for the Exar network device drivers.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_S2IO) += s2io.o
|
||||
obj-$(CONFIG_VXGE) += vxge/
|
Загрузка…
Ссылка в новой задаче