瀏覽代碼

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>
Ben Hutchings 12 年之前
父節點
當前提交
2206209e75
共有 3 個文件被更改,包括 5 次插入7 次删除
  1. 1 2
      arch/cris/arch-v10/drivers/Kconfig
  2. 1 2
      arch/cris/arch-v32/drivers/Kconfig
  3. 3 3
      drivers/staging/silicom/Kconfig

+ 1 - 2
arch/cris/arch-v10/drivers/Kconfig

@@ -2,8 +2,7 @@ if ETRAX_ARCH_V10
 
 
 config ETRAX_ETHERNET
 config ETRAX_ETHERNET
 	bool "Ethernet support"
 	bool "Ethernet support"
-	depends on ETRAX_ARCH_V10
-	select ETHERNET
+	depends on ETRAX_ARCH_V10 && NETDEVICES
 	select MII
 	select MII
 	help
 	help
 	  This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
 	  This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet

+ 1 - 2
arch/cris/arch-v32/drivers/Kconfig

@@ -2,8 +2,7 @@ if ETRAX_ARCH_V32
 
 
 config ETRAX_ETHERNET
 config ETRAX_ETHERNET
 	bool "Ethernet support"
 	bool "Ethernet support"
-	depends on ETRAX_ARCH_V32
-	select ETHERNET
+	depends on ETRAX_ARCH_V32 && NETDEVICES
 	select MII
 	select MII
 	help
 	help
 	  This option enables the ETRAX FS built-in 10/100Mbit Ethernet
 	  This option enables the ETRAX FS built-in 10/100Mbit Ethernet

+ 3 - 3
drivers/staging/silicom/Kconfig

@@ -5,7 +5,7 @@
 config NET_VENDOR_SILICOM
 config NET_VENDOR_SILICOM
 	bool "Silicom devices"
 	bool "Silicom devices"
 	default y
 	default y
-	depends on PCI
+	depends on PCI && NETDEVICES
 	---help---
 	---help---
 	  If you have a network card (Ethernet) belonging to this class,
 	  If you have a network card (Ethernet) belonging to this class,
 	  say Y.
 	  say Y.
@@ -19,7 +19,7 @@ if NET_VENDOR_SILICOM
 
 
 config SBYPASS
 config SBYPASS
 	tristate "Silicom BypassCTL library support"
 	tristate "Silicom BypassCTL library support"
-	depends on PCI && NET
+	depends on PCI
 	depends on m
 	depends on m
 	---help---
 	---help---
 	  If you have a network (Ethernet) controller of this type, say Y
 	  If you have a network (Ethernet) controller of this type, say Y
@@ -29,7 +29,7 @@ config SBYPASS
 
 
 config BPCTL
 config BPCTL
 	tristate "Silicom BypassCTL net support"
 	tristate "Silicom BypassCTL net support"
-	depends on PCI && NET
+	depends on PCI
 	depends on m
 	depends on m
 	select SBYPASS
 	select SBYPASS
 	select MII
 	select MII