diff options
author | stephen hemminger <shemminger@vyatta.com> | 2011-07-07 01:51:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-08 11:53:33 -0400 |
commit | 560040b8400bbc9074ff23afb28891378482ee52 (patch) | |
tree | 37e673bc881c41fd0e5c7c82d0fa50fead73653d /drivers/net/Kconfig | |
parent | 4ec8f0ca2ab6e1f89fd0ea73ede92a2e2d7409ef (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>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 8 |
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 | |||
2272 | will be called sis190. This is recommended. | 2272 | will be called sis190. This is recommended. |
2273 | 2273 | ||
2274 | config SKGE | 2274 | config SKGE |
2275 | tristate "SysKonnect GigaEthernet support" | 2275 | tristate "Marvell Yukon Gigabit Ethernet support" |
2276 | depends on PCI | 2276 | depends on PCI |
2277 | select CRC32 | 2277 | select CRC32 |
2278 | ---help--- | 2278 | ---help--- |
@@ -2288,7 +2288,7 @@ config SKGE | |||
2288 | Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. | 2288 | Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. |
2289 | 2289 | ||
2290 | It does not support the newer Yukon2 chipset: a separate driver, | 2290 | It does not support the newer Yukon2 chipset: a separate driver, |
2291 | sky2, is provided for Yukon2-based adapters. | 2291 | sky2, is provided for these adapters. |
2292 | 2292 | ||
2293 | To compile this driver as a module, choose M here: the module | 2293 | To compile this driver as a module, choose M here: the module |
2294 | will be called skge. This is recommended. | 2294 | will be called skge. This is recommended. |
@@ -2313,7 +2313,7 @@ config SKGE_GENESIS | |||
2313 | by making code smaller. If unsure say Y. | 2313 | by making code smaller. If unsure say Y. |
2314 | 2314 | ||
2315 | config SKY2 | 2315 | config SKY2 |
2316 | tristate "SysKonnect Yukon2 support" | 2316 | tristate "Marvell Yukon 2 support" |
2317 | depends on PCI | 2317 | depends on PCI |
2318 | select CRC32 | 2318 | select CRC32 |
2319 | ---help--- | 2319 | ---help--- |
@@ -2323,7 +2323,7 @@ config SKY2 | |||
2323 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 | 2323 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 |
2324 | 2324 | ||
2325 | There is companion driver for the older Marvell Yukon and | 2325 | There is companion driver for the older Marvell Yukon and |
2326 | Genesis based adapters: skge. | 2326 | SysKonnect Genesis based adapters: skge. |
2327 | 2327 | ||
2328 | To compile this driver as a module, choose M here: the module | 2328 | To compile this driver as a module, choose M here: the module |
2329 | will be called sky2. This is recommended. | 2329 | will be called sky2. This is recommended. |