Merge branch 'linus' into perf/urgent

[pandora-kernel.git] / drivers / staging / brcm80211 / Kconfig

diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig
index b6f8635..f4cf9b2 100644 (file)
--- a/drivers/staging/brcm80211/Kconfig
+++ b/drivers/staging/brcm80211/Kconfig
@@ -1,21 +1,26 @@
-menuconfig BRCM80211
-       tristate "Broadcom IEEE802.11n WLAN drivers"
-       depends on WLAN
+config BRCMUTIL
+       tristate
+       default n
 
 config BRCMSMAC
-       bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
+       tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
+       default n
        depends on PCI
-       depends on BRCM80211 && MAC80211
+       depends on WLAN && MAC80211
+       select BRCMUTIL
        select FW_LOADER
+       select CRC_CCITT
        ---help---
          This module adds support for PCIe wireless adapters based on Broadcom
          IEEE802.11n SoftMAC chipsets.  If you choose to build a module, it'll
          be called brcmsmac.ko.
 
 config BRCMFMAC
-       bool "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
+       tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
+       default n
        depends on MMC
-       depends on BRCM80211 && CFG80211
+       depends on WLAN && CFG80211
+       select BRCMUTIL
        select FW_LOADER
        select WIRELESS_EXT
        select WEXT_PRIV
@@ -28,6 +33,6 @@ config BRCMFMAC
 config BRCMDBG
        bool "Broadcom driver debug functions"
        default n
-       depends on BRCM80211
+       depends on BRCMSMAC || BRCMFMAC
        ---help---
          Selecting this enables additional code for debug purposes.