diff options
| author | Jon Mason <jon.mason@exar.com> | 2010-11-11 04:26:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-11 09:30:23 -0800 |
| commit | 1901d042abf10d08a829961a63fd158f9844587e (patch) | |
| tree | a5a699cd90d2d7a67de44454c656ed69f60bd00c /drivers/net/Kconfig | |
| parent | ca3e3b8fae982400dacbbf19f3112cc84e51d46a (diff) | |
| download | lwn-1901d042abf10d08a829961a63fd158f9844587e.tar.gz lwn-1901d042abf10d08a829961a63fd158f9844587e.zip | |
vxge: update Kconfig
Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO).
Signed-off-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f6668cdaac85..fa62a63db166 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2772,29 +2772,38 @@ config IXGB will be called ixgb. config S2IO - tristate "S2IO 10Gbe XFrame NIC" + tristate "Exar Xframe 10Gb Ethernet Adapter" depends on PCI ---help--- - This driver supports the 10Gbe XFrame NIC of S2IO. + 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 "Neterion X3100 Series 10GbE PCIe Server Adapter" + tristate "Exar X3100 Series 10GbE PCIe Server Adapter" depends on PCI && INET ---help--- - This driver supports Neterion Inc's X3100 Series 10 GbE PCIe + 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 - driver. By default only few debug trace statements are enabled. + the vxge driver. By default only few debug trace statements are + enabled. config MYRI10GE tristate "Myricom Myri-10G Ethernet support" |