From 890c5e8eb9e0083877307ad3db7a95cead6a1661 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sat, 10 Feb 2007 03:48:17 +0000 Subject: [PATCH] --- yaml --- r: 49053 b: refs/heads/master c: 0b3581e26d4807f36b2294366d6fbd506c30d68a h: refs/heads/master i: 49051: 609938748afd7d0cab83a0d1259c41ff2452a3f6 v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 00a3d220fea8..eb2dd8c2b578 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdcac1878c80b068d8e073c1691d4bd09ba9996d +refs/heads/master: 0b3581e26d4807f36b2294366d6fbd506c30d68a diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index bd76b12c7c45..d9400ef87195 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2125,14 +2125,16 @@ config SKY2 will be called sky2. This is recommended. config SK98LIN - tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" + tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)" depends on PCI ---help--- Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx compliant Gigabit Ethernet Adapter. - This driver supports the original Yukon chipset. A cleaner driver is - also available (skge) which seems to work better than this one. + This driver supports the original Yukon chipset. This driver is + deprecated and will be removed from the kernel in the near future, + it has been replaced by the skge driver. skge is cleaner and + seems to work better. This driver does not support the newer Yukon2 chipset. A separate driver, sky2, is provided to support Yukon2-based adapters.