diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-06-18 04:37:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-20 07:22:56 +0200 |
| commit | 2206209e758e3d930a550bacfc0db6303e2df6bd (patch) | |
| tree | da7d00fcc543ce1a008c0fa1049ab906505b94ea | |
| parent | at91_ether: Do not select NET_CORE (diff) | |
| download | linux-2206209e758e3d930a550bacfc0db6303e2df6bd.tar.xz linux-2206209e758e3d930a550bacfc0db6303e2df6bd.zip | |
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>
| -rw-r--r-- | arch/cris/arch-v10/drivers/Kconfig | 3 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/silicom/Kconfig | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 8eab0c61d57b..daf5f19b61a1 100644 --- 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 91c4e54ca904..4f223506a2aa 100644 --- 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 fc082db628ec..6651bd819bc8 100644 --- 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 |