diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:43:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:43:33 -0500 |
| commit | d00d598ffbba974d9045ba8b95296655fe2162c5 (patch) | |
| tree | 93bdc3bf4ec728d554c54e3f1f51cb5597f53a31 /net | |
| parent | b5632303401c231bf270ef36f1013e52caf4caf9 (diff) | |
| parent | be0d9b6c7aeaad1683059c00131cabd4c894c17c (diff) | |
Merge branch 'master'
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 91b16fbf91f..d18ccba3ea9 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig @@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" - depends on IEEE80211 + depends on IEEE80211 && NET_RADIO select CRYPTO select CRYPTO_MICHAEL_MIC ---help--- |