diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-05 22:58:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-05 22:58:05 -0500 |
| commit | a29961b33b089cf4d252ac125891a2784d20ef2f (patch) | |
| tree | 8fcaa56db74d1357b73ddebb33fadba410ed1439 /net | |
| parent | 731a0609df9cef35ae861d31004f50a02ebde6c2 (diff) | |
| parent | b79caa68c0d48477453a90d12be34b47cb75f3a8 (diff) | |
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 @@ | |||
| 1 | config MAC80211 | 1 | config MAC80211 |
| 2 | tristate "Generic IEEE 802.11 Networking Stack (mac80211)" | 2 | tristate "Generic IEEE 802.11 Networking Stack (mac80211)" |
| 3 | depends on EXPERIMENTAL | ||
| 4 | select CRYPTO | 3 | select CRYPTO |
| 5 | select CRYPTO_ECB | 4 | select CRYPTO_ECB |
| 6 | select CRYPTO_ARC4 | 5 | select CRYPTO_ARC4 |