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

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
config WILC1000 config WILC1000
tristate "WILC1000 support (WiFi only)" tristate "WILC1000 support (WiFi only)"
depends on !S390 depends on !S390
depends on CFG80211 && WEXT_CORE && INET
depends on MMC || SPI
---help--- ---help---
This module only support IEEE 802.11n WiFi. This module only support IEEE 802.11n WiFi.
...@@ -9,7 +11,7 @@ choice ...@@ -9,7 +11,7 @@ choice
depends on WILC1000 depends on WILC1000
default WILC1000_PREALLOCATE_AT_LOADING_DRIVER default WILC1000_PREALLOCATE_AT_LOADING_DRIVER
config WILC1000_PREALLOCATE_AT_LOADING_DRIVER config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
bool "Preallocate memory at loading driver" bool "Preallocate memory at loading driver"
---help--- ---help---
This choice supports static allocation of the memory This choice supports static allocation of the memory
...@@ -17,7 +19,7 @@ choice ...@@ -17,7 +19,7 @@ choice
during initial time. The driver will also free the buffer during initial time. The driver will also free the buffer
by calling network device stop. by calling network device stop.
config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
bool "Dynamically allocate memory in real time" bool "Dynamically allocate memory in real time"
---help--- ---help---
This choice supports dynamic allocation of the memory This choice supports dynamic allocation of the memory
...@@ -25,7 +27,6 @@ choice ...@@ -25,7 +27,6 @@ choice
when it is required. when it is required.
endchoice endchoice
choice choice
prompt "Bus Type" prompt "Bus Type"
depends on WILC1000 depends on WILC1000
...@@ -35,17 +36,19 @@ choice ...@@ -35,17 +36,19 @@ choice
bool "SDIO support" bool "SDIO support"
depends on MMC depends on MMC
---help--- ---help---
This module adds support for the SDIO interface of adapters using This module adds support for the SDIO interface
WILC chipset. Select this if your platform is using the SDIO bus. of adapters using WILC chipset. Select this if
your platform is using the SDIO bus.
config WILC1000_SPI config WILC1000_SPI
depends on SPI
bool "SPI support" bool "SPI support"
---help--- ---help---
This module adds support for the SPI interface of adapters using This module adds support for the SPI interface
WILC chipset. Select this if your platform is using the SPI bus. of adapters using WILC chipset. Select this if
your platform is using the SPI bus.
endchoice endchoice
config WILC1000_HW_OOB_INTR config WILC1000_HW_OOB_INTR
bool "Use out of band interrupt" bool "Use out of band interrupt"
depends on WILC1000 && WILC1000_SDIO depends on WILC1000 && WILC1000_SDIO
...@@ -53,4 +56,3 @@ config WILC1000_HW_OOB_INTR ...@@ -53,4 +56,3 @@ config WILC1000_HW_OOB_INTR
---help--- ---help---
If your platform don't recognize SDIO IRQ, connect chipset external IRQ pin 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. and check this option. Or, Use this to get all interrupts including SDIO interrupts.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment