Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / net / wireless / b43 / Kconfig

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 088d544ec63f940b2a7b2234f1eac9b7458a19ce..e3f67b8d3f8003d546867b51648d25fda81d0f15 100644 (file)
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -1,7 +1,8 @@
 config B43
        tristate "Broadcom 43xx wireless support (mac80211 stack)"
-       depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
-       select SSB
+       depends on (BCMA_POSSIBLE || SSB_POSSIBLE) && MAC80211 && HAS_DMA
+       select BCMA if B43_BCMA
+       select SSB if B43_SSB
        select FW_LOADER
        ---help---
          b43 is a driver for the Broadcom 43xx series wireless devices.
@@ -27,14 +28,33 @@ config B43
          If unsure, say M.
 
 config B43_BCMA
-       bool "Support for BCMA bus"
-       depends on B43 && (BCMA = y || BCMA = B43)
-       default y
+       bool
 
 config B43_SSB
        bool
-       depends on B43 && (SSB = y || SSB = B43)
-       default y
+
+choice
+       prompt "Supported bus types"
+       depends on B43
+       default B43_BCMA_AND_SSB
+
+config B43_BUSES_BCMA_AND_SSB
+       bool "BCMA and SSB"
+       depends on BCMA_POSSIBLE && SSB_POSSIBLE
+       select B43_BCMA
+       select B43_SSB
+
+config B43_BUSES_BCMA
+       bool "BCMA only"
+       depends on BCMA_POSSIBLE
+       select B43_BCMA
+
+config B43_BUSES_SSB
+       bool "SSB only"
+       depends on SSB_POSSIBLE
+       select B43_SSB
+
+endchoice
 
 # Auto-select SSB PCI-HOST support, if possible
 config B43_PCI_AUTOSELECT
@@ -53,7 +73,7 @@ config B43_PCICORE_AUTOSELECT
 
 config B43_PCMCIA
        bool "Broadcom 43xx PCMCIA device support"
-       depends on B43 && SSB_PCMCIAHOST_POSSIBLE
+       depends on B43 && B43_SSB && SSB_PCMCIAHOST_POSSIBLE
        select SSB_PCMCIAHOST
        ---help---
          Broadcom 43xx PCMCIA device support.
@@ -73,7 +93,7 @@ config B43_PCMCIA
 
 config B43_SDIO
        bool "Broadcom 43xx SDIO device support"
-       depends on B43 && SSB_SDIOHOST_POSSIBLE
+       depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
        select SSB_SDIOHOST
        ---help---
          Broadcom 43xx device support for Soft-MAC SDIO devices.
@@ -98,7 +118,7 @@ config B43_BCMA_PIO
 
 config B43_PIO
        bool
-       depends on B43
+       depends on B43 && B43_SSB
        select SSB_BLOCKIO
        default y
 
@@ -116,7 +136,7 @@ config B43_PHY_N
 
 config B43_PHY_LP
        bool "Support for low-power (LP-PHY) devices"
-       depends on B43
+       depends on B43 && B43_SSB
        default y
        ---help---
          Support for the LP-PHY.