diff --git a/[refs] b/[refs] index 9d69fad4ac5c..79c305cc62db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef6cc1d6a2b625d2780914caa0d7bca61bdb14be +refs/heads/master: 33bc95513c801b1637b6fb925155fb794b5da4f0 diff --git a/trunk/drivers/staging/brcm80211/Kconfig b/trunk/drivers/staging/brcm80211/Kconfig index 59e9c8548d01..f51e0f17d70d 100644 --- a/trunk/drivers/staging/brcm80211/Kconfig +++ b/trunk/drivers/staging/brcm80211/Kconfig @@ -1,10 +1,8 @@ config BRCMUTIL tristate - default n config BRCMSMAC tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" - default n depends on PCI depends on WLAN && MAC80211 depends on BCMA=n @@ -20,7 +18,6 @@ config BRCMSMAC config BRCMFMAC tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver" - default n depends on MMC depends on WLAN && CFG80211 select BRCMUTIL @@ -33,7 +30,6 @@ config BRCMFMAC config BRCMDBG bool "Broadcom driver debug functions" - default n depends on BRCMSMAC || BRCMFMAC ---help--- Selecting this enables additional code for debug purposes.