projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' into upstream
[powerpc.git]
/
net
/
ieee80211
/
Kconfig
diff --git
a/net/ieee80211/Kconfig
b/net/ieee80211/Kconfig
index
58ed431
..
dbb0852
100644
(file)
--- a/
net/ieee80211/Kconfig
+++ b/
net/ieee80211/Kconfig
@@
-1,6
+1,5
@@
config IEEE80211
tristate "Generic IEEE 802.11 Networking Stack"
config IEEE80211
tristate "Generic IEEE 802.11 Networking Stack"
- select NET_RADIO
---help---
This option enables the hardware independent IEEE 802.11
networking stack.
---help---
This option enables the hardware independent IEEE 802.11
networking stack.
@@
-56,7
+55,7
@@
config IEEE80211_CRYPT_CCMP
config IEEE80211_CRYPT_TKIP
tristate "IEEE 802.11i TKIP encryption"
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---
select CRYPTO
select CRYPTO_MICHAEL_MIC
---help---
@@
-67,3
+66,4
@@
config IEEE80211_CRYPT_TKIP
This can be compiled as a modules and it will be called
"ieee80211_crypt_tkip".
This can be compiled as a modules and it will be called
"ieee80211_crypt_tkip".
+source "net/ieee80211/softmac/Kconfig"