diff mbox

staging/wilc: fix Kconfig dependencies, second try

Message ID 4253270.hGxaSY0VLA@wuerfel (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann Oct. 19, 2015, 9:39 a.m. UTC 
On Monday 19 October 2015 16:54:23 Tony Cho wrote:
> Hi Arnd Bergmann,
> 
> When I apply this patch, I cannot make WILC1000 module (wilc1000.ko) because CONFIG_WILC1000 is y and also I can see some link errors for the cfg80211 APIs.
> 
> Can you consider this patch?

Ah, you are right. I see the same thing now and don't know what caused me
to send the patch in an incomplete state.

I hope this snippet is the last missing piece:


I'll do a few hundred more randconfig builds with this on top and submit
it once it succeeds.

	Arnd

Comments

Arnd Bergmann Oct. 19, 2015, 9:53 a.m. UTC | #1 
On Monday 19 October 2015 11:39:31 Arnd Bergmann wrote:
> On Monday 19 October 2015 16:54:23 Tony Cho wrote:
> > Hi Arnd Bergmann,
> > 
> > When I apply this patch, I cannot make WILC1000 module (wilc1000.ko) because CONFIG_WILC1000 is y and also I can see some link errors for the cfg80211 APIs.
> > 
> > Can you consider this patch?
> 
> Ah, you are right. I see the same thing now and don't know what caused me
> to send the patch in an incomplete state.
> 
> I hope this snippet is the last missing piece:
> 

No, that was not it either, I'll start over to think this through.

The real solution of course is to make it possible to load both the
SPI and MMC front-ends at the same time and have a common base driver,
which I might have to do, in order to clear myself of the shame of sending
not one but two incorrect fixes for this problem ;-)

	Arnd
Arnd Bergmann Oct. 20, 2015, 10:42 p.m. UTC | #2 
On Monday 19 October 2015 11:53:40 Arnd Bergmann wrote:
> On Monday 19 October 2015 11:39:31 Arnd Bergmann wrote:
> > On Monday 19 October 2015 16:54:23 Tony Cho wrote:
> > > Hi Arnd Bergmann,
> > > 
> > > When I apply this patch, I cannot make WILC1000 module (wilc1000.ko) because CONFIG_WILC1000 is y and also I can see some link errors for the cfg80211 APIs.
> > > 
> > > Can you consider this patch?
> > 
> > Ah, you are right. I see the same thing now and don't know what caused me
> > to send the patch in an incomplete state.
> > 
> > I hope this snippet is the last missing piece:
> > 
> 
> No, that was not it either, I'll start over to think this through.
> 
> The real solution of course is to make it possible to load both the
> SPI and MMC front-ends at the same time and have a common base driver,
> which I might have to do, in order to clear myself of the shame of sending
> not one but two incorrect fixes for this problem 

I spent too much time on it now, but I have a series that should fix
this part for real and let you build both drivers into the kernel
(or as modules) in a single configuration.

	Arnd
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig
index ee51b4278088..e3f109655be4 100644
--- a/drivers/staging/wilc1000/Kconfig
+++ b/drivers/staging/wilc1000/Kconfig
@@ -1,6 +1,7 @@ 
 config WILC1000_DRIVER
-	bool "WILC1000 support (WiFi only)"
+	tristate "WILC1000 support (WiFi only)"
 	depends on CFG80211 && WEXT_CORE && INET
+	depends on MMC || SPI
 	---help---
 	  This module only support IEEE 802.11n WiFi.
 
@@ -35,7 +36,7 @@  choice
 
 config WILC1000_SDIO
 	bool "SDIO support"
-	depends on MMC
+	depends on MMC=y || (MMC=m && WILC1000_DRIVER=m)
 	select WILC1000
 	---help---
 	  This module adds support for the SDIO interface of adapters using