From: DanielC <puff65537@bansheeslibrary.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCHv2 3.6rc5.linux-next 1/1] Staging: silicom: Force depend on module
Date: Mon, 10 Sep 2012 19:18:12 -0700 [thread overview]
Message-ID: <20120911021812.GA20636@elbert.example.com> (raw)
In-Reply-To: <20120910180413.GA31046@kroah.com>
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>
---
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
prev parent reply other threads:[~2012-09-10 19:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 7:04 linux-next: build failure after merge of the final tree (staging tree related) Stephen Rothwell
2012-09-10 17:31 ` Greg KH
2012-09-11 1:43 ` [PATCH 3.6rc5.linux-next 1/1] Force module DanielC
2012-09-10 18:04 ` Greg KH
2012-09-11 2:18 ` DanielC [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120911021812.GA20636@elbert.example.com \
--to=puff65537@bansheeslibrary.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.