diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 19:56:03 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 19:56:03 +0400 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/iwlwifi/Kconfig | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
| download | linux-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Kconfig')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 727fbb5db9da..5cf43236421e 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig @@ -133,12 +133,3 @@ config IWLWIFI_P2P support when it is loaded. Say Y only if you want to experiment with P2P. - -config IWLWIFI_EXPERIMENTAL_MFP - bool "support MFP (802.11w) even if uCode doesn't advertise" - depends on IWLWIFI - help - This option enables experimental MFP (802.11W) support - even if the microcode doesn't advertise it. - - Say Y only if you want to experiment with MFP. |