aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2012-09-19 10:58:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-21 08:56:40 -0700
commit8fb0aebddffa1f3ef97a18dde98cf8003ce8d6c8 (patch)
treed93fb14074ec62ed738a74fb66b39bd45bd1ea52
parentstaging: omap-thermal: bandgap: fix setting of alert thresholds (diff)
downloadlinux-dev-8fb0aebddffa1f3ef97a18dde98cf8003ce8d6c8.tar.xz
linux-dev-8fb0aebddffa1f3ef97a18dde98cf8003ce8d6c8.zip
staging: fix silicom dependencies and build errors
Fix kconfig dependencies in silicom. Fixes these build errors: ERROR: "init_net" [drivers/staging/silicom/bypasslib/bypass.ko] undefined! ERROR: "register_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "unregister_netdevice_notifier" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "init_net" [drivers/staging/silicom/bpctl_mod.ko] undefined! ERROR: "netdev_info" [drivers/net/mii.ko] undefined! ERROR: "netif_carrier_on" [drivers/net/mii.ko] undefined! ERROR: "netif_carrier_off" [drivers/net/mii.ko] undefined! Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/silicom/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig
index cb07a0da0f63..eda2e7d73645 100644
--- a/drivers/staging/silicom/Kconfig
+++ b/drivers/staging/silicom/Kconfig
@@ -19,7 +19,7 @@ if NET_VENDOR_SILICOM
config SBYPASS
tristate "Silicom BypassCTL library support"
- depends on PCI
+ depends on PCI && NET
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
+ depends on PCI && NET
depends on m
select SBYPASS
select NET_CORE