public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta•com>
To: "David S. Miller" <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH net-next 5/5] skge/sky2: change config references to Marvell
Date: Thu, 07 Jul 2011 08:51:01 -0700	[thread overview]
Message-ID: <20110707155212.350112276@vyatta.com> (raw)
In-Reply-To: 20110707155056.939223264@vyatta.com

[-- Attachment #1: marvell.patch --]
[-- Type: text/plain, Size: 1498 bytes --]

Change references to SysKonnect in Kconfig to Marvell since
SysKonnect was acquired by Marvell back in 2002.

Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>


--- a/drivers/net/Kconfig	2011-07-07 08:39:18.456011945 -0700
+++ b/drivers/net/Kconfig	2011-07-07 08:43:41.372026416 -0700
@@ -2272,7 +2272,7 @@ config SIS190
 	  will be called sis190.  This is recommended.
 
 config SKGE
-	tristate "SysKonnect GigaEthernet support"
+	tristate "Marvell Yukon Gigabit Ethernet support"
 	depends on PCI
 	select CRC32
 	---help---
@@ -2288,7 +2288,7 @@ config SKGE
 	  Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
 
 	  It does not support the newer Yukon2 chipset: a separate driver,
-	  sky2, is provided for Yukon2-based adapters.
+	  sky2, is provided for these adapters.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called skge.  This is recommended.
@@ -2313,7 +2313,7 @@ config SKGE_GENESIS
 	 by making code smaller. If unsure say Y.
 
 config SKY2
-	tristate "SysKonnect Yukon2 support"
+	tristate "Marvell Yukon 2 support"
 	depends on PCI
 	select CRC32
 	---help---
@@ -2323,7 +2323,7 @@ config SKY2
 	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
 
 	  There is companion driver for the older Marvell Yukon and
-	  Genesis based adapters: skge.
+	  SysKonnect Genesis based adapters: skge.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called sky2.  This is recommended.



      parent reply	other threads:[~2011-07-07 16:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 15:50 [PATCH net-next 0/5] sky2 driver update Stephen Hemminger
2011-07-07 15:50 ` [PATCH net-next 1/5] sky2: force receive checksum when using RSS on some hardware Stephen Hemminger
2011-07-07 17:04   ` Michał Mirosław
2011-07-07 17:13     ` Stephen Hemminger
2011-07-07 17:40       ` Michał Mirosław
2011-07-07 23:40       ` [PATCH net-next 1/5] sky2: force receive checksum when using RSS on some hardware (v2) Stephen Hemminger
2011-07-08  8:45         ` Michał Mirosław
2011-07-08 15:32           ` Stephen Hemminger
2011-07-08 15:54         ` David Miller
2011-07-07 15:50 ` [PATCH net-next 2/5] sky2: use correct Inter Packet Gap at 10/100mbit Stephen Hemminger
2011-07-07 15:50 ` [PATCH net-next 3/5] sky2: support for new Optima chipsets (EXPERIMENTAL) Stephen Hemminger
2011-07-07 15:51 ` [PATCH net-next 4/5] sky2: version 1.29 Stephen Hemminger
2011-07-07 15:51 ` Stephen Hemminger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110707155212.350112276@vyatta.com \
    --to=shemminger@vyatta$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox