Merge /spare/repo/linux-2.6/

[pandora-kernel.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ae9e7a5..a584f03 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1738,11 +1738,18 @@ config 68360_ENET
          the Motorola 68360 processor.
 
 config FEC
          the Motorola 68360 processor.
 
 config FEC

-       bool "FEC ethernet controller (of ColdFire 5272)"
-       depends on M5272 || M5282
+       bool "FEC ethernet controller (of ColdFire CPUs)"
+       depends on M523x || M527x || M5272 || M528x

        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet

-         controller on the Motorola ColdFire 5272 processor.
+         controller on some Motorola ColdFire processors.
+
+config FEC2
+       bool "Second FEC ethernet controller (on some ColdFire CPUs)"
+       depends on FEC
+       help
+         Say Y here if you want to use the second built-in 10/100 Fast
+         ethernet controller on some Motorola ColdFire processors.

 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"


@@ -1948,7 +1955,25 @@ config SKGE
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
 
          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
+       select CRC32
+       ---help---
+         This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sky2.  This is recommended.
+
+config SKY2_EC_A1
+       bool "Support old Yukon-EC A1 chipset"
+       depends on SKY2
+       ---help---
+         Include support for early revisions of the Yukon EC chipset
+         that required extra workarounds. If in doubt, say N.
+

 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI
 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI


@@ -2058,6 +2083,13 @@ config BNX2
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called bnx2.  This is recommended.
 

+config SPIDER_NET
+       tristate "Spider Gigabit Ethernet driver"
+       depends on PCI && PPC_BPA
+       help
+         This driver supports the Gigabit Ethernet chips present on the
+         Cell Processor-Based Blades from IBM.
+

 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx
 config GIANFAR
        tristate "Gianfar Ethernet"
        depends on 85xx || 83xx