Skip to content

Commit 2206209

Browse files
bwhacksdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d6cf7a8 commit 2206209

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

arch/cris/arch-v10/drivers/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ if ETRAX_ARCH_V10
22

33
config ETRAX_ETHERNET
44
bool "Ethernet support"
5-
depends on ETRAX_ARCH_V10
6-
select ETHERNET
5+
depends on ETRAX_ARCH_V10 && NETDEVICES
76
select MII
87
help
98
This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet

arch/cris/arch-v32/drivers/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ if ETRAX_ARCH_V32
22

33
config ETRAX_ETHERNET
44
bool "Ethernet support"
5-
depends on ETRAX_ARCH_V32
6-
select ETHERNET
5+
depends on ETRAX_ARCH_V32 && NETDEVICES
76
select MII
87
help
98
This option enables the ETRAX FS built-in 10/100Mbit Ethernet

drivers/staging/silicom/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
config NET_VENDOR_SILICOM
66
bool "Silicom devices"
77
default y
8-
depends on PCI
8+
depends on PCI && NETDEVICES
99
---help---
1010
If you have a network card (Ethernet) belonging to this class,
1111
say Y.
@@ -19,7 +19,7 @@ if NET_VENDOR_SILICOM
1919

2020
config SBYPASS
2121
tristate "Silicom BypassCTL library support"
22-
depends on PCI && NET
22+
depends on PCI
2323
depends on m
2424
---help---
2525
If you have a network (Ethernet) controller of this type, say Y
@@ -29,7 +29,7 @@ config SBYPASS
2929

3030
config BPCTL
3131
tristate "Silicom BypassCTL net support"
32-
depends on PCI && NET
32+
depends on PCI
3333
depends on m
3434
select SBYPASS
3535
select MII

0 commit comments

Comments
 (0)