diff options
author | Jon Mason <jon.mason@exar.com> | 2010-11-10 23:26:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-11 12:30:23 -0500 |
commit | 1901d042abf10d08a829961a63fd158f9844587e (patch) | |
tree | a5a699cd90d2d7a67de44454c656ed69f60bd00c /drivers/net/Kconfig | |
parent | ca3e3b8fae982400dacbbf19f3112cc84e51d46a (diff) |
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 | |||
2772 | will be called ixgb. | 2772 | will be called ixgb. |
2773 | 2773 | ||
2774 | config S2IO | 2774 | config S2IO |
2775 | tristate "S2IO 10Gbe XFrame NIC" | 2775 | tristate "Exar Xframe 10Gb Ethernet Adapter" |
2776 | depends on PCI | 2776 | depends on PCI |
2777 | ---help--- | 2777 | ---help--- |
2778 | This driver supports the 10Gbe XFrame NIC of S2IO. | 2778 | This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters. |
2779 | |||
2779 | More specific information on configuring the driver is in | 2780 | More specific information on configuring the driver is in |
2780 | <file:Documentation/networking/s2io.txt>. | 2781 | <file:Documentation/networking/s2io.txt>. |
2781 | 2782 | ||
2783 | To compile this driver as a module, choose M here. The module | ||
2784 | will be called s2io. | ||
2785 | |||
2782 | config VXGE | 2786 | config VXGE |
2783 | tristate "Neterion X3100 Series 10GbE PCIe Server Adapter" | 2787 | tristate "Exar X3100 Series 10GbE PCIe Server Adapter" |
2784 | depends on PCI && INET | 2788 | depends on PCI && INET |
2785 | ---help--- | 2789 | ---help--- |
2786 | This driver supports Neterion Inc's X3100 Series 10 GbE PCIe | 2790 | This driver supports Exar Corp's X3100 Series 10 GbE PCIe |
2787 | I/O Virtualized Server Adapter. | 2791 | I/O Virtualized Server Adapter. |
2792 | |||
2788 | More specific information on configuring the driver is in | 2793 | More specific information on configuring the driver is in |
2789 | <file:Documentation/networking/vxge.txt>. | 2794 | <file:Documentation/networking/vxge.txt>. |
2790 | 2795 | ||
2796 | To compile this driver as a module, choose M here. The module | ||
2797 | will be called vxge. | ||
2798 | |||
2791 | config VXGE_DEBUG_TRACE_ALL | 2799 | config VXGE_DEBUG_TRACE_ALL |
2792 | bool "Enabling All Debug trace statments in driver" | 2800 | bool "Enabling All Debug trace statments in driver" |
2793 | default n | 2801 | default n |
2794 | depends on VXGE | 2802 | depends on VXGE |
2795 | ---help--- | 2803 | ---help--- |
2796 | Say Y here if you want to enabling all the debug trace statements in | 2804 | Say Y here if you want to enabling all the debug trace statements in |
2797 | driver. By default only few debug trace statements are enabled. | 2805 | the vxge driver. By default only few debug trace statements are |
2806 | enabled. | ||
2798 | 2807 | ||
2799 | config MYRI10GE | 2808 | config MYRI10GE |
2800 | tristate "Myricom Myri-10G Ethernet support" | 2809 | tristate "Myricom Myri-10G Ethernet support" |