diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 13:27:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 13:27:40 -0800 |
| commit | 00ab2f3df33dd3e649904765767dd87ffbcb3acf (patch) | |
| tree | ae0ed11f35b61e3199fb696fcd8aa06f3032ed76 /drivers/net/Kconfig | |
| parent | 4cf808eb443ead42777a0230b73aec0cee7fb298 (diff) | |
| parent | f5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 (diff) | |
| download | kernel_samsung_smdk4412-00ab2f3df33dd3e649904765767dd87ffbcb3acf.tar.gz kernel_samsung_smdk4412-00ab2f3df33dd3e649904765767dd87ffbcb3acf.tar.bz2 kernel_samsung_smdk4412-00ab2f3df33dd3e649904765767dd87ffbcb3acf.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 47c72a63dfe..e45a8f95971 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2020,8 +2020,8 @@ config SIS190 will be called sis190. This is recommended. config SKGE - tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + tristate "New SysKonnect GigaEthernet support" + depends on PCI select CRC32 ---help--- This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx @@ -2082,7 +2082,6 @@ config SK98LIN - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter - Allied Telesyn AT-2971T Gigabit Ethernet Adapter - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45 - - DGE-530T Gigabit Ethernet Adapter - EG1032 v2 Instant Gigabit Network Adapter - EG1064 v2 Instant Gigabit Network Adapter - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit) |