---

yaml --- r: 324993 b: refs/heads/master c: 739309d h: refs/heads/master i: 324991: 2df8fb1 v: v3
git-mirror · Sep 10, 2012 · 79aa2bc · 79aa2bc
1 parent 96e86df
commit 79aa2bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9869a937d3a93c75c1d32e61df29149ce78ec3f9
+refs/heads/master: 739309d0cd8ad15234cba1d8df587c7eced5882a
diff --git a/trunk/drivers/staging/silicom/Kconfig b/trunk/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/trunk/drivers/staging/silicom/TODO b/trunk/drivers/staging/silicom/TODO
@@ -3,5 +3,6 @@ TODO:
 	- locking audit
 	- single module with all functionality
 	- userland 
+	- fix monolithic build.