Skip to content

Commit

Permalink
net: Add missing dependencies on NETDEVICES
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Jun 20, 2013
1 parent d6cf7a8 commit 2206209
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
3 changes: 1 addition & 2 deletions arch/cris/arch-v10/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions arch/cris/arch-v32/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/silicom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2206209

Please sign in to comment.