gianfar needs crc32 lib dependency

[powerpc.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38f41a5..a3d46ea 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -430,10 +430,10 @@ config HPLANCE
 
 config LASI_82596
        tristate "Lasi ethernet"
-       depends on NET_ETHERNET && PARISC && GSC_LASI
+       depends on NET_ETHERNET && GSC
        help
-         Say Y here to support the on-board Intel 82596 ethernet controller
-         built into Hewlett-Packard PA-RISC machines.
+         Say Y here to support the builtin Intel 82596 ethernet controller
+         found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
 
 config MIPS_JAZZ_SONIC
        tristate "MIPS JAZZ onboard SONIC Ethernet support"
@@ -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.
@@ -2243,7 +2245,7 @@ config BNX2
 
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
-       depends on PCI && PPC_IBM_CELL_BLADE
+       depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
        select FW_LOADER
        help
          This driver supports the Gigabit Ethernet chips present on the
@@ -2261,6 +2263,7 @@ config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx || PPC_86xx
        select PHYLIB
+       select CRC32
        help
          This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
          and MPC86xx family of chips, and the FEC on the 8540.
@@ -2305,27 +2308,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 +2319,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
@@ -2391,22 +2373,23 @@ config CHELSIO_T1_NAPI
          when the driver is receiving lots of packets from the card.
 
 config CHELSIO_T3
-        tristate "Chelsio Communications T3 10Gb Ethernet support"
-        depends on PCI
-        help
-          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
-          adapters.
+       tristate "Chelsio Communications T3 10Gb Ethernet support"
+       depends on PCI
+       select FW_LOADER
+       help
+         This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
+         adapters.
 
-          For general information about Chelsio and our products, visit
-          our website at <http://www.chelsio.com>.
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
 
-          For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.htm>.
 
-          Please send feedback to <linux-bugs@chelsio.com>.
+         Please send feedback to <linux-bugs@chelsio.com>.
 
-          To compile this driver as a module, choose M here: the module
-          will be called cxgb3.
+         To compile this driver as a module, choose M here: the module
+         will be called cxgb3.
 
 config EHEA
        tristate "eHEA Ethernet support"