diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-06 04:58:05 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-06 04:58:05 +0100 |
commit | a29961b33b089cf4d252ac125891a2784d20ef2f (patch) | |
tree | 8fcaa56db74d1357b73ddebb33fadba410ed1439 /net | |
parent | [PPPOL2TP]: Label unused warning when CONFIG_PROC_FS is not set. (diff) | |
parent | b43: Fix DMA for 30/32-bit DMA engines (diff) | |
download | linux-a29961b33b089cf4d252ac125891a2784d20ef2f.tar.xz linux-a29961b33b089cf4d252ac125891a2784d20ef2f.zip |
Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index e77592d050ce..45c7c0c3875e 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -1,6 +1,5 @@ config MAC80211 tristate "Generic IEEE 802.11 Networking Stack (mac80211)" - depends on EXPERIMENTAL select CRYPTO select CRYPTO_ECB select CRYPTO_ARC4 |