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

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

staging/wilc1000: fix Kconfig dependencies



The newly added wilc1000 driver lacks several Kconfig dependencies,
resulting in a multitude of randconfig build errors, e.g.:

drivers/built-in.o: In function `WILC_WFI_mgmt_tx_cancel_wait':
binder.c:(.text+0x12bd28): undefined reference to `cfg80211_remain_on_channel_expired'
drivers/built-in.o: In function `WILC_WFI_CfgSetChannel':
binder.c:(.text+0x12c9d8): undefined reference to `ieee80211_frequency_to_channel'
drivers/built-in.o: In function `WILC_WFI_CfgAlloc':
binder.c:(.text+0x132530): undefined reference to `wiphy_new_nm'
drivers/built-in.o: In function `wilc_netdev_init':
binder.c:(.text+0x1356d0): undefined reference to `register_inetaddr_notifier'
drivers/built-in.o: In function `linux_spi_init':
binder.c:(.text+0x210a68): undefined reference to `spi_register_driver'

This change ensures that we always have at least one of SPI or MMC
enabled, and are only able to pick an interface that works. It also
adds all the missing dependencies for networking infrastructure
(cfg80211, wext, and ipv4).

In order to make it readable, I also took the liberty of re-indenting
the Kconfig file to the normal conventions.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3cb742c
Loading
Loading
Loading
Loading
+39 −37
Original line number Diff line number Diff line
config WILC1000
	tristate "WILC1000 support (WiFi only)"
	depends on !S390
	depends on CFG80211 && WEXT_CORE && INET
	depends on MMC || SPI
	---help---
	  This module only support IEEE 802.11n WiFi.

@@ -25,7 +27,6 @@ choice
	  when it is required.
endchoice


choice
	prompt "Bus Type"
	depends on WILC1000
@@ -35,17 +36,19 @@ choice
	bool "SDIO support"
	depends on MMC
	---help---
			This module adds support for the SDIO interface of adapters using
			WILC chipset. Select this if your platform is using the SDIO bus. 
	  This module adds support for the SDIO interface
	  of adapters using WILC chipset. Select this if
	  your platform is using the SDIO bus.

	config WILC1000_SPI
	depends on SPI
	bool "SPI support"
	---help---
			This module adds support for the SPI interface of adapters using
			WILC chipset. Select this if your platform is using the SPI bus. 
	  This module adds support for the SPI interface
	  of adapters using WILC chipset. Select this if
	  your platform is using the SPI bus.
endchoice


config WILC1000_HW_OOB_INTR
	bool "Use out of band interrupt"
	depends on WILC1000 && WILC1000_SDIO
@@ -53,4 +56,3 @@ config WILC1000_HW_OOB_INTR
	---help---
	  If your platform don't recognize SDIO IRQ, connect chipset external IRQ pin
	  and check this option. Or, Use this to get all interrupts including SDIO interrupts.