---

yaml --- r: 49053 b: refs/heads/master c: 0b3581e h: refs/heads/master i: 49051: 6099387 v: v3
git-mirror · Feb 17, 2007 · 890c5e8 · 890c5e8
1 parent 6a94d4f
commit 890c5e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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.