Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a0f0e60..4675c1b 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -26,14 +26,6 @@ menuconfig NETDEVICES
 # that for each of the symbols.
 if NETDEVICES
 
 # that for each of the symbols.
 if NETDEVICES
 

-config NETDEVICES_MULTIQUEUE
-       bool "Netdevice multiple hardware queue support"
-       ---help---
-         Say Y here if you want to allow the network stack to use multiple
-         hardware TX queues on an ethernet device.
-
-         Most people will say N here.
-

 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
 config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT


@@ -467,6 +459,13 @@ config SNI_82596
          Say Y here to support the on-board Intel 82596 ethernet controller
          built into SNI RM machines.
 
          Say Y here to support the on-board Intel 82596 ethernet controller
          built into SNI RM machines.
 

+config KORINA
+       tristate "Korina (IDT RC32434) Ethernet support"
+       depends on NET_ETHERNET && MIKROTIK_RB532
+       help
+         If you have a Mikrotik RouterBoard 500 or IDT RC32434
+         based system say Y. Otherwise say N.
+

 config MIPS_JAZZ_SONIC
        tristate "MIPS JAZZ onboard SONIC Ethernet support"
        depends on MACH_JAZZ
 config MIPS_JAZZ_SONIC
        tristate "MIPS JAZZ onboard SONIC Ethernet support"
        depends on MACH_JAZZ


@@ -517,6 +516,18 @@ config STNIC
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config SH_ETH
+       tristate "Renesas SuperH Ethernet support"
+       depends on SUPERH && \
+               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)
+       select CRC32
+       select MII
+       select MDIO_BITBANG
+       select PHYLIB
+       help
+         Renesas SuperH Ethernet device driver.
+         This driver support SH7710 and SH7712.
+

 config SUNLANCE
        tristate "Sun LANCE support"
        depends on SBUS
 config SUNLANCE
        tristate "Sun LANCE support"
        depends on SBUS


@@ -820,7 +831,7 @@ config ULTRA32
 
 config BFIN_MAC
        tristate "Blackfin 527/536/537 on-chip mac support"
 
 config BFIN_MAC
        tristate "Blackfin 527/536/537 on-chip mac support"

-       depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
+       depends on NET_ETHERNET && (BF527 || BF537 || BF536)

        select CRC32
        select MII
        select PHYLIB
        select CRC32
        select MII
        select PHYLIB


@@ -919,6 +930,23 @@ config DM9000
          To compile this driver as a module, choose M here.  The module
          will be called dm9000.
 
          To compile this driver as a module, choose M here.  The module
          will be called dm9000.
 

+config DM9000_DEBUGLEVEL
+       int "DM9000 maximum debug level"
+       depends on DM9000
+       default 4
+       help
+         The maximum level of debugging code compiled into the DM9000
+         driver.
+
+config DM9000_FORCE_SIMPLE_PHY_POLL
+       bool "Force simple NSR based PHY polling"
+       depends on DM9000
+       ---help---
+         This configuration forces the DM9000 to use the NSR's LinkStatus
+         bit to determine if the link is up or down instead of the more
+         costly MII PHY reads. Note, this will not work if the chip is
+         operating with an external PHY.
+

 config ENC28J60
        tristate "ENC28J60 support"
        depends on EXPERIMENTAL && SPI && NET_ETHERNET
 config ENC28J60
        tristate "ENC28J60 support"
        depends on EXPERIMENTAL && SPI && NET_ETHERNET


@@ -936,19 +964,11 @@ config ENC28J60_WRITEVERIFY
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 

-config DM9000_DEBUGLEVEL
-       int "DM9000 maximum debug level"
-       depends on DM9000
-       default 4
-       help
-         The maximum level of debugging code compiled into the DM9000
-         driver.
-

 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
        select MII

-       depends on ARCH_PXA || SH_MAGIC_PANEL_R2
+       depends on ARCH_PXA || SUPERH

        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
        help
          This is a driver for SMSC's LAN911x series of Ethernet chipsets
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.


@@ -1236,7 +1256,6 @@ config IBMVETH
          To compile this driver as a module, choose M here. The module will
          be called ibmveth.
 
          To compile this driver as a module, choose M here. The module will
          be called ibmveth.
 

-source "drivers/net/ibm_emac/Kconfig"

 source "drivers/net/ibm_newemac/Kconfig"
 
 config NET_PCI
 source "drivers/net/ibm_newemac/Kconfig"
 
 config NET_PCI


@@ -1266,20 +1285,6 @@ config PCNET32
          To compile this driver as a module, choose M here. The module
          will be called pcnet32.
 
          To compile this driver as a module, choose M here. The module
          will be called pcnet32.
 

-config PCNET32_NAPI
-       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
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config AMD8111_ETH
        tristate "AMD 8111 (new PCI lance) support"
        depends on NET_PCI && PCI
 config AMD8111_ETH
        tristate "AMD 8111 (new PCI lance) support"
        depends on NET_PCI && PCI


@@ -1293,20 +1298,6 @@ config AMD8111_ETH
          To compile this driver as a module, choose M here. The module
          will be called amd8111e.
 
          To compile this driver as a module, choose M here. The module
          will be called amd8111e.
 

-config AMD8111E_NAPI
-       bool "Use RX polling (NAPI)"
-       depends on AMD8111_ETH
-       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
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI
 config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI


@@ -1321,20 +1312,6 @@ config ADAPTEC_STARFIRE
          To compile this driver as a module, choose M here: the module
          will be called starfire.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called starfire.  This is recommended.
 

-config ADAPTEC_STARFIRE_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on ADAPTEC_STARFIRE && EXPERIMENTAL
-       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
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config AC3200
        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
        depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL
 config AC3200
        tristate "Ansel Communications EISA 3200 support (EXPERIMENTAL)"
        depends on NET_PCI && (ISA || EISA) && EXPERIMENTAL


@@ -1360,7 +1337,7 @@ config APRICOT
 
 config B44
        tristate "Broadcom 440x/47xx ethernet support"
 
 config B44
        tristate "Broadcom 440x/47xx ethernet support"

-       depends on SSB_POSSIBLE
+       depends on SSB_POSSIBLE && HAS_DMA

        select SSB
        select MII
        help
        select SSB
        select MII
        help


@@ -1431,7 +1408,7 @@ config CS89x0
 config TC35815
        tristate "TOSHIBA TC35815 Ethernet support"
        depends on NET_PCI && PCI && MIPS
 config TC35815
        tristate "TOSHIBA TC35815 Ethernet support"
        depends on NET_PCI && PCI && MIPS

-       select MII
+       select PHYLIB

 
 config EEPRO100
        tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
 
 config EEPRO100
        tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"


@@ -1677,7 +1654,7 @@ config SUNDANCE_MMIO
 
 config TLAN
        tristate "TI ThunderLAN support"
 
 config TLAN
        tristate "TI ThunderLAN support"

-       depends on NET_PCI && (PCI || EISA) && !64BIT
+       depends on NET_PCI && (PCI || EISA)

        ---help---
          If you have a PCI Ethernet network card based on the ThunderLAN chip
          which is supported by this driver, say Y and read the
        ---help---
          If you have a PCI Ethernet network card based on the ThunderLAN chip
          which is supported by this driver, say Y and read the


@@ -2004,7 +1981,7 @@ config E1000_DISABLE_PACKET_SPLIT
 
 config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
 
 config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"

-       depends on PCI
+       depends on PCI && (!SPARC32 || BROKEN)

        ---help---
          This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
          ethernet family of adapters. For PCI or PCI-X e1000 adapters,
        ---help---
          This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
          ethernet family of adapters. For PCI or PCI-X e1000 adapters,


@@ -2021,9 +1998,6 @@ config E1000E
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
 
          To compile this driver as a module, choose M here. The module
          will be called e1000e.
 

-config E1000E_ENABLED
-       def_bool E1000E != n
-

 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL


@@ -2112,27 +2086,13 @@ config R8169
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
 
          To compile this driver as a module, choose M here: the module
          will be called r8169.  This is recommended.
 

-config R8169_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on R8169 && EXPERIMENTAL
-       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
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config R8169_VLAN
        bool "VLAN support"
        depends on R8169 && VLAN_8021Q
        ---help---
          Say Y here for the r8169 driver to support the functions required
          by the kernel 802.1Q code.
 config R8169_VLAN
        bool "VLAN support"
        depends on R8169 && VLAN_8021Q
        ---help---
          Say Y here for the r8169 driver to support the functions required
          by the kernel 802.1Q code.

-         
+

          If in doubt, say Y.
 
 config SB1250_MAC
          If in doubt, say Y.
 
 config SB1250_MAC


@@ -2220,93 +2180,6 @@ config SKY2_DEBUG
 
         If unsure, say N.
 
 
         If unsure, say N.
 

-config SK98LIN
-       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. 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.
-
-         The following adapters are supported by this driver:
-           - 3Com 3C940 Gigabit LOM Ethernet Adapter
-           - 3Com 3C941 Gigabit LOM Ethernet Adapter
-           - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
-           - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
-           - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
-           - EG1032 v2 Instant Gigabit Network Adapter
-           - EG1064 v2 Instant Gigabit Network Adapter
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
-           - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
-           - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
-           - Marvell RDK-8001 Adapter
-           - Marvell RDK-8002 Adapter
-           - Marvell RDK-8003 Adapter
-           - Marvell RDK-8004 Adapter
-           - Marvell RDK-8006 Adapter
-           - Marvell RDK-8007 Adapter
-           - Marvell RDK-8008 Adapter
-           - Marvell RDK-8009 Adapter
-           - Marvell RDK-8010 Adapter
-           - Marvell RDK-8011 Adapter
-           - Marvell RDK-8012 Adapter
-           - Marvell RDK-8052 Adapter
-           - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
-           - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
-           - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
-           - SK-9521 10/100/1000Base-T Adapter
-           - SK-9521 V2.0 10/100/1000Base-T Adapter
-           - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
-           - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
-           - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
-           - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
-           - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
-           - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
-           - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
-           - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-           - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
-           - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-           - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
-           - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
-           - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
-           - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
-           - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
-           - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
-           - SMC EZ Card 1000 (SMC9452TXV.2)
-         
-         The adapters support Jumbo Frames.
-         The dual link adapters support link-failover and dual port features.
-         Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 
-         the scatter-gather functionality with sendfile(). Please refer to 
-         <file:Documentation/networking/sk98lin.txt> for more information about
-         optional driver parameters.
-         Questions concerning this driver may be addressed to:
-             <linux@syskonnect.de>
-         
-         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.
-

 config VIA_VELOCITY
        tristate "VIA Velocity support"
        depends on PCI
 config VIA_VELOCITY
        tristate "VIA Velocity support"
        depends on PCI


@@ -2322,6 +2195,7 @@ config VIA_VELOCITY
 config TIGON3
        tristate "Broadcom Tigon3 support"
        depends on PCI
 config TIGON3
        tristate "Broadcom Tigon3 support"
        depends on PCI

+       select PHYLIB

        help
          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
 
        help
          This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
 


@@ -2358,6 +2232,7 @@ config TSI108_ETH
 config GELIC_NET
        tristate "PS3 Gigabit Ethernet driver"
        depends on PPC_PS3
 config GELIC_NET
        tristate "PS3 Gigabit Ethernet driver"
        depends on PPC_PS3

+       select PS3_SYS_MANAGER

        help
          This driver supports the network device on the PS3 game
          console.  This driver has built-in support for Ethernet.
        help
          This driver supports the network device on the PS3 game
          console.  This driver has built-in support for Ethernet.


@@ -2366,15 +2241,28 @@ config GELIC_NET
          module will be called ps3_gelic.
 
 config GELIC_WIRELESS
          module will be called ps3_gelic.
 
 config GELIC_WIRELESS

-       bool "PS3 Wireless support"
-       depends on GELIC_NET
-       select WIRELESS_EXT
+       bool "PS3 Wireless support"
+       depends on GELIC_NET
+       select WIRELESS_EXT
+       help
+         This option adds the support for the wireless feature of PS3.
+         If you have the wireless-less model of PS3 or have no plan to
+         use wireless feature, disabling this option saves memory.  As
+         the driver automatically distinguishes the models, you can
+         safely enable this option even if you have a wireless-less model.
+
+config GELIC_WIRELESS_OLD_PSK_INTERFACE
+       bool "PS3 Wireless private PSK interface (OBSOLETE)"
+       depends on GELIC_WIRELESS

        help
        help

-        This option adds the support for the wireless feature of PS3.
-        If you have the wireless-less model of PS3 or have no plan to
-        use wireless feature, disabling this option saves memory.  As
-        the driver automatically distinguishes the models, you can
-        safely enable this option even if you have a wireless-less model.
+          This option retains the obsolete private interface to pass
+          the PSK from user space programs to the driver.  The PSK
+          stands for 'Pre Shared Key' and is used for WPA[2]-PSK
+          (WPA-Personal) environment.
+          If WPA[2]-PSK is used and you need to use old programs that
+          support only this old interface, say Y.  Otherwise N.
+
+          If unsure, say N.

 
 config GIANFAR
        tristate "Gianfar Ethernet"
 
 config GIANFAR
        tristate "Gianfar Ethernet"


@@ -2415,7 +2303,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
        tristate "Marvell Discovery (643XX) and Orion ethernet support"
 
 config MV643XX_ETH
        tristate "Marvell Discovery (643XX) and Orion ethernet support"

-       depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION
+       depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION

        select MII
        help
          This driver supports the gigabit ethernet MACs in the
        select MII
        help
          This driver supports the gigabit ethernet MACs in the


@@ -2500,8 +2388,9 @@ config CHELSIO_T1_NAPI
 
 config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"
 
 config CHELSIO_T3
        tristate "Chelsio Communications T3 10Gb Ethernet support"

-       depends on PCI
+       depends on PCI && INET

        select FW_LOADER
        select FW_LOADER

+       select INET_LRO

        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.
        help
          This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
          adapters.


@@ -2519,7 +2408,7 @@ config CHELSIO_T3
 
 config EHEA
        tristate "eHEA Ethernet support"
 
 config EHEA
        tristate "eHEA Ethernet support"

-       depends on IBMEBUS && INET
+       depends on IBMEBUS && INET && SPARSEMEM

        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.
        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.


@@ -2529,7 +2418,8 @@ config EHEA
 
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"
 
 config IXGBE
        tristate "Intel(R) 10GbE PCI Express adapters support"

-       depends on PCI
+       depends on PCI && INET
+       select INET_LRO

        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go
        ---help---
          This driver supports Intel(R) 10GbE PCI Express family of
          adapters.  For more information on how to identify your adapter, go


@@ -2589,20 +2479,6 @@ config S2IO
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 

-config S2IO_NAPI
-       bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
-       depends on S2IO && EXPERIMENTAL
-       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
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-

 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET
 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET


@@ -2635,7 +2511,7 @@ config NIU
 
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
 
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"

-       depends on PPC64 && PCI
+       depends on PPC_PASEMI && PCI

        select PHYLIB
        select INET_LRO
        help
        select PHYLIB
        select INET_LRO
        help


@@ -2667,11 +2543,13 @@ config BNX2X
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI
        select ZLIB_INFLATE
        tristate "Broadcom NetXtremeII 10Gb support"
        depends on PCI
        select ZLIB_INFLATE

+       select LIBCRC32C

        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module
          will be called bnx2x.  This is recommended.
 
        help
          This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.
          To compile this driver as a module, choose M here: the module
          will be called bnx2x.  This is recommended.
 

+source "drivers/net/sfc/Kconfig"

 
 endif # NETDEV_10000
 
 
 endif # NETDEV_10000