1 files changed, 12 insertions, 18 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e8d69b0adf90..9af05a2f4af3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -166,16 +166,6 @@ config NET_SB1000
 
           If you don't have this card, of course say N.
 
-config IP1000
-        tristate "IP1000 Gigabit Ethernet support"
-        depends on PCI && EXPERIMENTAL
-        select MII
-        ---help---
-          This driver supports IP1000 gigabit Ethernet cards.
-
-          To compile this driver as a module, choose M here: the module
-          will be called ipg.  This is recommended.
-
 source "drivers/net/arcnet/Kconfig"
 
 source "drivers/net/phy/Kconfig"
@@ -888,7 +878,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN
+        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
           including the SMC91C94 and the SMC91C111. Say Y if you want it
@@ -926,7 +916,7 @@ config SMC911X
         tristate "SMSC LAN911[5678] support"
         select CRC32
         select MII
-        depends on ARCH_PXA || SUPERH
+        depends on ARCH_PXA || SH_MAGIC_PANEL_R2
         help
           This is a driver for SMSC's LAN911x series of Ethernet chipsets
           including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -1986,12 +1976,19 @@ config E1000E
 
           <http://support.intel.com>
 
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/e1000e.txt>.
-
           To compile this driver as a module, choose M here. The module
           will be called e1000e.
 
+config IP1000
+        tristate "IP1000 Gigabit Ethernet support"
+        depends on PCI && EXPERIMENTAL
+        select MII
+        ---help---
+          This driver supports IP1000 gigabit Ethernet cards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ipg.  This is recommended.
+
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
@@ -2468,9 +2465,6 @@ config IXGBE
 
           <http://support.intel.com>
 
-          More specific information on configuring the driver is in
-          <file:Documentation/networking/ixgbe.txt>.
-
           To compile this driver as a module, choose M here. The module
           will be called ixgbe.