diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/brcm80211/Kconfig | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/Kconfig')
-rw-r--r-- | drivers/staging/brcm80211/Kconfig | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig new file mode 100644 index 0000000..57d2d1b --- /dev/null +++ b/drivers/staging/brcm80211/Kconfig @@ -0,0 +1,33 @@ +menuconfig BRCM80211 + tristate "Broadcom IEEE802.11n WLAN drivers" + depends on WLAN + +choice + prompt "Broadcom IEEE802.11n driver style" + depends on BRCM80211 + help + Select the appropriate driver style from the list below. + +config BRCM80211_PCI + bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" + depends on PCI + depends on BRCM80211 && MAC80211 + select FW_LOADER + ---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 brcm80211.ko. + +config BRCMFMAC + bool "Broadcom IEEE802.11n embedded FullMAC WLAN driver" + depends on MMC + depends on BRCM80211 && CFG80211 + select FW_LOADER + select WIRELESS_EXT + select WEXT_PRIV + ---help--- + This module adds support for embedded wireless adapters based on + Broadcom IEEE802.11n FullMAC chipsets. This driver uses the kernel's + wireless extensions subsystem. If you choose to build a module, + it'll be called brcmfmac.ko. +endchoice |