[PATCHv2 3.6rc5.linux-next 1/1] Staging: silicom: Force depend onmodule
From: DanielC
Date: Mon Sep 10 2012 - 16:09:26 EST
Staging: silicom: Force depend on module until monolithic build fixed
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Daniel Cotey <puff65537@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/silicom/Kconfig | 5 ++++-
drivers/staging/silicom/TODO | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig
index 1914844..045ab08 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
depends on BROKEN
---help---
If you have a network card (Ethernet) belonging to this class,
@@ -20,6 +20,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
@@ -29,6 +31,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..a39821f 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.
--
1.7.11.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/