diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 10:18:01 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 10:18:01 +0300 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /net/ieee80211/Kconfig | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz | |
drm: merge in Linus mainline
Diffstat (limited to 'net/ieee80211/Kconfig')
| -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 91b16fbf91f0..d18ccba3ea9e 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--- |