net: Add missing dependencies on NETDEVICES

ETRAX_ETHERNET selects ETHERNET and MII, which depend on NETDEVICES.
I don't think anything should select NETDEVICES, so make it a
dependency.  It also doesn't need to select or depend on ETHERNET,
which has nothing to do with the Ethernet library functions.

BPCTL selects MII, which depends on NETDEVICES.  But everything in the
drivers/staging/silicom directory is related to net devices, so make
NET_VENDOR_SILICOM depend on NETDEVICES and remove the now-redundant
dependencies on NET.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 8eab0c61d57b470035b1207d008a44abcca1b692..daf5f19b61a12bd54e23acd09a0db76132228993 100644 (file)
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -2,8 +2,7 @@ if ETRAX_ARCH_V10
 
 config ETRAX_ETHERNET
        bool "Ethernet support"
-       depends on ETRAX_ARCH_V10
-       select ETHERNET
+       depends on ETRAX_ARCH_V10 && NETDEVICES
        select MII
        help
          This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 91c4e54ca904fd53d2e52a9b439fe291dd234f7d..4f223506a2aa8b837e39622ebc37ce942d91a632 100644 (file)
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -2,8 +2,7 @@ if ETRAX_ARCH_V32
 
 config ETRAX_ETHERNET
        bool "Ethernet support"
-       depends on ETRAX_ARCH_V32
-       select ETHERNET
+       depends on ETRAX_ARCH_V32 && NETDEVICES
        select MII
        help
          This option enables the ETRAX FS built-in 10/100Mbit Ethernet

diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig
index fc082db628ec5709b8913206182f5ecd54b33c52..6651bd819bc8138db36be845223bde5d7f1759d4 100644 (file)
--- a/drivers/staging/silicom/Kconfig
+++ b/drivers/staging/silicom/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_SILICOM
        bool "Silicom devices"
        default y
-       depends on PCI
+       depends on PCI && NETDEVICES
        ---help---
          If you have a network card (Ethernet) belonging to this class,
          say Y.
@@ -19,7 +19,7 @@ if NET_VENDOR_SILICOM
 
 config SBYPASS
        tristate "Silicom BypassCTL library support"
-       depends on PCI && NET
+       depends on PCI
        depends on m
        ---help---
          If you have a network (Ethernet) controller of this type, say Y
@@ -29,7 +29,7 @@ config SBYPASS
 
 config BPCTL
        tristate "Silicom BypassCTL net support"
-       depends on PCI && NET
+       depends on PCI
        depends on m
        select SBYPASS
        select MII