Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc43a4b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/wilc: fix Kconfig dependencies, second try 



My first attempt to fix the Kconfig logic for wilc1000 was incomplete,
as it missed the case where SPI is built-in while SDIO is modular
and wilc1000 is configured as built-in in SPI mode (or vice versa),
which would still lead to a link failure.

This works around the problem by adding an intermediate Kconfig
symbol "WILC1000_DRIVER" that controls visibility of the SDIO and
SPI sub-drivers, so we can control the dependencies better.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 9535ebc5 ("staging/wilc1000: fix Kconfig dependencies")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92af89d3

drivers/staging/wilc1000/Kconfig

+14 −9
Original line number Diff line number Diff line 
config WILC1000

	tristate "WILC1000 support (WiFi only)"

	depends on !S390

config WILC1000_DRIVER

	bool "WILC1000 support (WiFi only)"

	depends on CFG80211 && WEXT_CORE && INET

	depends on MMC || SPI

	---help---

	  This module only support IEEE 802.11n WiFi.



if WILC1000_DRIVER



config WILC1000

	tristate



choice

        prompt "Memory Allocation"

        depends on WILC1000

        default WILC1000_PREALLOCATE_AT_LOADING_DRIVER



config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
@@ -29,12 +31,12 @@ endchoice 


choice

	prompt "Bus Type"

	depends on WILC1000

	default WILC1000_SDIO



config WILC1000_SDIO

	bool "SDIO support"

	depends on MMC

	select WILC1000

	---help---

	  This module adds support for the SDIO interface of adapters using

	  WILC1000 chipset. The Atmel WILC1000 SDIO is a full speed interface.
@@ -47,6 +49,7 @@ choice 


config WILC1000_SPI

	depends on SPI

	select WILC1000

	bool "SPI support"

	---help---

	  This module adds support for the SPI interface of adapters using
@@ -60,7 +63,7 @@ endchoice 


config WILC1000_HW_OOB_INTR

	bool "Use out of band interrupt"

	depends on WILC1000 && WILC1000_SDIO

	depends on WILC1000_SDIO

	default n

	---help---

	  This option enables out-of-band interrupt support for the WILC1000
@@ -68,3 +71,5 @@ config WILC1000_HW_OOB_INTR 
	  mechanism for SDIO host controllers that don't support SDIO interrupt.

	  Select this option If the SDIO host controller in your platform

	  doesn't support SDIO time devision interrupt.



endif