diff --git a/[refs] b/[refs]
index dee528a9601f..3b2b27a290d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee1c81917a0c10f44c1b400482b8372e68238ff8
+refs/heads/master: 1cf9e8a7865c0ac216034e519cf6b8505055ea50
diff --git a/trunk/net/ieee80211/Kconfig b/trunk/net/ieee80211/Kconfig
index 91b16fbf91f0..d18ccba3ea9e 100644
--- a/trunk/net/ieee80211/Kconfig
+++ b/trunk/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---