]> Pileus Git - ~andy/linux/commitdiff
Staging: silicom: Force depend on module
authorDanielC <puff65537@bansheeslibrary.com>
Tue, 11 Sep 2012 02:18:12 +0000 (19:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Sep 2012 18:19:34 +0000 (11:19 -0700)
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>
drivers/staging/silicom/Kconfig
drivers/staging/silicom/TODO

index 3493ee8b24cc3a56f28491a93f4ac677425c8a62..cb07a0da0f63c890e875cb0778a5590ef55b5f06 100644 (file)
@@ -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
index bf60714f9fc90ed791e5c20b6c566c4007e0ceea..09d07b0ea9c0060cf408ffbd4ccf9ddf5bd1028c 100644 (file)
@@ -3,5 +3,6 @@ TODO:
        - locking audit
        - single module with all functionality
        - userland 
+       - fix monolithic build.