From patchwork Fri Oct 29 02:19:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69550 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 69275B6F07 for ; Fri, 29 Oct 2010 13:21:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760265Ab0J2CU1 (ORCPT ); Thu, 28 Oct 2010 22:20:27 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:38349 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760227Ab0J2CU0 (ORCPT ); Thu, 28 Oct 2010 22:20:26 -0400 Received: by mail-yw0-f46.google.com with SMTP id 9so1727254ywk.19 for ; Thu, 28 Oct 2010 19:20:25 -0700 (PDT) Received: by 10.150.220.16 with SMTP id s16mr21395713ybg.149.1288318825859; Thu, 28 Oct 2010 19:20:25 -0700 (PDT) Received: from arkham.kudzu.us (cpe-72-177-2-76.austin.res.rr.com [72.177.2.76]) by mx.google.com with ESMTPS id q41sm1303594ybk.13.2010.10.28.19.20.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 28 Oct 2010 19:20:25 -0700 (PDT) Received: by arkham.kudzu.us (sSMTP sendmail emulation); Thu, 28 Oct 2010 21:20:22 -0500 From: Jon Mason To: David Miller Cc: netdev@vger.kernel.org, Sivakumar Subramani , Sreenivasa Honnur , Ram Vepa Subject: [PATCH 10/11] vxge: update Kconfig Date: Thu, 28 Oct 2010 21:19:45 -0500 Message-Id: <1288318786-12319-10-git-send-email-jon.mason@exar.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288318786-12319-1-git-send-email-jon.mason@exar.com> References: <1288318786-12319-1-git-send-email-jon.mason@exar.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO). Signed-off-by: Jon Mason Signed-off-by: Ram Vepa --- drivers/net/Kconfig | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 77c1fab..123a11e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2750,29 +2750,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 . + 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 . + 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"