summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-07-07 05:51:01 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-08 08:53:33 -0700
commit560040b8400bbc9074ff23afb28891378482ee52 (patch)
tree37e673bc881c41fd0e5c7c82d0fa50fead73653d
parent4ec8f0ca2ab6e1f89fd0ea73ede92a2e2d7409ef (diff)
skge/sky2: change config references to Marvell
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7cae8b619e54..17ed4dda7c04 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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.