[IEEE80211]: Fix softmac lockdep reports.

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 83b3f7b8fb7399a6f54be303be4926e9ec3457f5..467532c7975ce61a7f44b1cc54a0da931c277708 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -481,10 +481,6 @@ config MIPS_AU1X00_ENET
          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
 
-config NET_SB1250_MAC
-       tristate "SB1250 Ethernet support"
-       depends on SIBYTE_SB1xxx_SOC
-
 config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
        depends on PCI && SGI_IP27
@@ -838,6 +834,8 @@ config BFIN_MAC
        tristate "Blackfin 536/537 on-chip mac support"
        depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)
        select CRC32
+       select MII
+       select PHYLIB
        select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
        help
          This is the driver for blackfin on-chip mac device. Say Y if you want it
@@ -1245,75 +1243,8 @@ config IBMVETH
          <file:Documentation/networking/net-modules.txt>. The module will
          be called ibmveth.
 
-config IBM_EMAC
-       tristate "PowerPC 4xx on-chip Ethernet support"
-       depends on 4xx && !PPC_MERGE
-       help
-         This driver supports the PowerPC 4xx EMAC family of on-chip
-          Ethernet controllers.
-
-config IBM_EMAC_RXB
-       int "Number of receive buffers"
-       depends on IBM_EMAC
-       default "128"
-
-config IBM_EMAC_TXB
-       int "Number of transmit buffers"
-       depends on IBM_EMAC
-       default "64"
-
-config IBM_EMAC_POLL_WEIGHT
-       int "MAL NAPI polling weight"
-       depends on IBM_EMAC
-       default "32"
-
-config IBM_EMAC_RX_COPY_THRESHOLD
-       int "RX skb copy threshold (bytes)"
-       depends on IBM_EMAC
-       default "256"
-
-config IBM_EMAC_RX_SKB_HEADROOM
-       int "Additional RX skb headroom (bytes)"
-       depends on IBM_EMAC
-       default "0"
-       help
-         Additional receive skb headroom. Note, that driver
-         will always reserve at least 2 bytes to make IP header
-         aligned, so usually there is no need to add any additional
-         headroom.
-         
-         If unsure, set to 0.
-
-config IBM_EMAC_PHY_RX_CLK_FIX
-       bool "PHY Rx clock workaround"
-       depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR)
-       help
-         Enable this if EMAC attached to a PHY which doesn't generate
-         RX clock if there is no link, if this is the case, you will 
-         see "TX disable timeout" or "RX disable timeout" in the system
-         log.
-         
-         If unsure, say N.
-
-config IBM_EMAC_DEBUG
-       bool "Debugging"
-       depends on IBM_EMAC
-       default n
-
-config IBM_EMAC_ZMII
-       bool
-       depends on IBM_EMAC && (NP405H || NP405L || 44x)
-       default y
-
-config IBM_EMAC_RGMII
-       bool
-       depends on IBM_EMAC && 440GX
-       default y
-               
-config IBM_EMAC_TAH
-       bool
-       depends on IBM_EMAC && 440GX
-       default y
+source "drivers/net/ibm_emac/Kconfig"
+source "drivers/net/ibm_newemac/Kconfig"
 
 config NET_PCI
        bool "EISA, VLB, PCI and on board controllers"
@@ -2192,6 +2123,18 @@ config R8169_VLAN
          
          If in doubt, say Y.
 
+config SB1250_MAC
+       tristate "SB1250 Gigabit Ethernet support"
+       depends on SIBYTE_SB1xxx_SOC
+       ---help---
+         This driver supports Gigabit Ethernet interfaces based on the
+         Broadcom SiByte family of System-On-a-Chip parts.  They include
+         the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
+         and BCM1480 chips.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sb1250-mac.
+
 config SIS190
        tristate "SiS190/SiS191 gigabit ethernet support"
        depends on PCI