Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256165
b: refs/heads/master
c: 560040b
h: refs/heads/master
i:
  256163: 85cd8f3
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Jul 8, 2011
1 parent e1de277 commit 735f719
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ec8f0ca2ab6e1f89fd0ea73ede92a2e2d7409ef
refs/heads/master: 560040b8400bbc9074ff23afb28891378482ee52
8 changes: 4 additions & 4 deletions trunk/drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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---
Expand All @@ -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.
Expand All @@ -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---
Expand All @@ -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.
Expand Down

0 comments on commit 735f719

Please sign in to comment.