scsi: use non-racy method for proc entries creation

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 978e72ab39c2bf3a993565cc9bbd3735d91c50b4..f90a86ba7e2f1fbf8fd10860d010ea8e8fd59af9 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -467,6 +467,13 @@ config SNI_82596
          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
@@ -820,7 +827,7 @@ config ULTRA32
 
 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
@@ -1431,7 +1438,7 @@ config CS89x0
 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)"
@@ -2004,7 +2011,7 @@ config E1000_DISABLE_PACKET_SPLIT
 
 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,
@@ -2271,6 +2278,7 @@ config TSI108_ETH
 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.
@@ -2328,7 +2336,7 @@ config UGETH_TX_ON_DEMAND
 
 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
@@ -2548,7 +2556,7 @@ config NIU
 
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
-       depends on PPC64 && PCI
+       depends on PPC_PASEMI && PCI
        select PHYLIB
        select INET_LRO
        help