diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-10-05 13:19:03 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 21:55:30 +0200 |
| commit | 5b435de0d786869c95d1962121af0d7df2542009 (patch) | |
| tree | 9b7cfbc4aa9f1ec0e719e3a0c677bd9f4e56540d /drivers/net/wireless/Kconfig | |
| parent | ath6kl: fixup merge damage in ath6kl_mgmt_tx (diff) | |
| download | linux-5b435de0d786869c95d1962121af0d7df2542009.tar.xz linux-5b435de0d786869c95d1962121af0d7df2542009.zip | |
net: wireless: add brcm80211 drivers
Add the brcm80211 tree to drivers/net/wireless, and disable the version that's
in drivers/staging. This version includes the sources currently in staging,
plus any changes that have been sent out for review.
Sources in staging will be deleted in a followup patch.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/Kconfig')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index f354bd4e121e..abd3b71cd4ab 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -271,6 +271,7 @@ config MWL8K source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/b43/Kconfig" source "drivers/net/wireless/b43legacy/Kconfig" +source "drivers/net/wireless/brcm80211/Kconfig" source "drivers/net/wireless/hostap/Kconfig" source "drivers/net/wireless/ipw2x00/Kconfig" source "drivers/net/wireless/iwlwifi/Kconfig" |