Take experimental tag of skge and sky2.
Mark sk98lin driver for future removal.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
--- git-2.6.orig/Documentation/feature-removal-schedule.txt
+++ git-2.6/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,14 @@ be removed from this file.
---------------------------
+What: sk98lin
+When December 2006
+Files: drivers/net/sk98lin/*
+Why: Superseded by the more supportable skge and sky2 drivers.
+Who: Stephen Hemminger <[EMAIL PROTECTED]>
+
+---------------------------
+
What: devfs
When: July 2005
Files: fs/devfs/*, include/linux/devfs_fs*.h and assorted devfs
--- git-2.6.orig/MAINTAINERS
+++ git-2.6/MAINTAINERS
@@ -2448,6 +2448,10 @@ M: [EMAIL PROTECTED]
L: [EMAIL PROTECTED]
S: Maintained
+SK98LIN DRIVER
+L: netdev@vger.kernel.org
+S: Obsolete
+
SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
P: Stephen Hemminger
M: [EMAIL PROTECTED]
--- git-2.6.orig/drivers/net/Kconfig
+++ git-2.6/drivers/net/Kconfig
@@ -2013,8 +2013,8 @@ config SIS190
will be called sis190. This is recommended.
config SKGE
- tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
+ tristate "SysKonnect GigaEthernet support"
+ depends on PCI
select CRC32
---help---
This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
@@ -2024,22 +2024,23 @@ config SKGE
It does not support the link failover and network management
features that "portable" vendor supplied sk98lin driver does.
-
config SKY2
- tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
+ tristate "SysKonnect Yukon2 support"
+ depends on PCI
select CRC32
---help---
- This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+ This driver supports gigabit adapters based on the Marvell Yukon 2
+ chipset (88E8053).
To compile this driver as a module, choose M here: the module
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 (obsolete
vendor driver)"
depends on PCI
+ default N
---help---
- Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
+ Original vendor driver for Marvell Yukon or SysKonnect SK-98xx/SK-95xx
compliant Gigabit Ethernet Adapter. The following adapters are
supported
by this driver:
- 3Com 3C940 Gigabit LOM Ethernet Adapter
@@ -2109,10 +2110,9 @@ config SK98LIN
Questions concerning this driver may be addressed to:
<[EMAIL PROTECTED]>
- If you want to compile this driver as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/kbuild/modules.txt>. The
module will
- be called sk98lin. This is recommended.
+ This driver is being phased out and use of skge instead is
+ recommended.
+
config VIA_VELOCITY
tristate "VIA Velocity support"
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
