Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38f41a593b1269961e8ce8040751c644a46fa9f6..9d5c083f33390dfc0c14f63f716d91117daf0deb 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1284,8 +1284,8 @@ config PCNET32
          will be called pcnet32.
 
 config PCNET32_NAPI
-       bool "Use RX polling (NAPI) (EXPERIMENTAL)"
-       depends on PCNET32 && EXPERIMENTAL
+       bool "Use RX polling (NAPI)"
+       depends on PCNET32
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
          when the driver is receiving lots of packets from the card. It is
@@ -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.
@@ -2305,27 +2307,6 @@ config MV643XX_ETH
          chipset which is used in the Momenco Ocelot C and Jaguar ATX and
          Pegasos II, amongst other PPC and MIPS boards.
 
-config MV643XX_ETH_0
-       bool "MV-643XX Port 0"
-       depends on MV643XX_ETH
-       help
-         This enables support for Port 0 of the Marvell MV643XX Gigabit
-         Ethernet.
-
-config MV643XX_ETH_1
-       bool "MV-643XX Port 1"
-       depends on MV643XX_ETH
-       help
-         This enables support for Port 1 of the Marvell MV643XX Gigabit
-         Ethernet.
-
-config MV643XX_ETH_2
-       bool "MV-643XX Port 2"
-       depends on MV643XX_ETH
-       help
-         This enables support for Port 2 of the Marvell MV643XX Gigabit
-         Ethernet.
-
 config QLA3XXX
        tristate "QLogic QLA3XXX Network Driver Support"
        depends on PCI
@@ -2337,7 +2318,7 @@ config QLA3XXX
 
 config ATL1
        tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"
-       depends on NET_PCI && PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL
        select CRC32
        select MII
        help