summaryrefslogtreecommitdiffstats
path: root/drivers/staging/silicom
diff options
context:
space:
mode:
authorDanielC <puff65537@bansheeslibrary.com>2012-09-10 19:18:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-10 11:19:34 -0700
commit739309d0cd8ad15234cba1d8df587c7eced5882a (patch)
tree5887ab497ed82d9e07d2387c0783320225edbb1d /drivers/staging/silicom
parent9869a937d3a93c75c1d32e61df29149ce78ec3f9 (diff)
downloadop-kernel-dev-739309d0cd8ad15234cba1d8df587c7eced5882a.zip
op-kernel-dev-739309d0cd8ad15234cba1d8df587c7eced5882a.tar.gz
Staging: silicom: Force depend on module
Staging: silicom: Force depend on module until monolithic build fixed Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/silicom')
-rw-r--r--drivers/staging/silicom/Kconfig5
-rw-r--r--drivers/staging/silicom/TODO1
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig
index 3493ee8..cb07a0d 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 (SSB_POSSIBLE && HAS_DMA) || PCI
+ depends on PCI
---help---
If you have a network card (Ethernet) belonging to this class,
say Y.
@@ -19,6 +19,8 @@ if NET_VENDOR_SILICOM
config SBYPASS
tristate "Silicom BypassCTL library support"
+ depends on PCI
+ depends on m
---help---
If you have a network (Ethernet) controller of this type, say Y
@@ -28,6 +30,7 @@ config SBYPASS
config BPCTL
tristate "Silicom BypassCTL net support"
depends on PCI
+ depends on m
select SBYPASS
select NET_CORE
select MII
diff --git a/drivers/staging/silicom/TODO b/drivers/staging/silicom/TODO
index bf60714..09d07b0 100644
--- a/drivers/staging/silicom/TODO
+++ b/drivers/staging/silicom/TODO
@@ -3,5 +3,6 @@ TODO:
- locking audit
- single module with all functionality
- userland
+ - fix monolithic build.
OpenPOWER on IntegriCloud