diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 22:55:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 22:55:57 -0500 |
| commit | fa4fa40a990f8f4eff65476bef32007c154bbac0 (patch) | |
| tree | c6e15822d1da2811ed004d3f8a4c72864adb5250 /net/ieee80211/Kconfig | |
| parent | b7ad6d75028d021362221d9b2db19fcff995c3f8 (diff) | |
| parent | fe0b06b123762ab620b5bee3dab1576ddddd0a7f (diff) | |
| download | blackbird-op-linux-fa4fa40a990f8f4eff65476bef32007c154bbac0.tar.gz blackbird-op-linux-fa4fa40a990f8f4eff65476bef32007c154bbac0.zip | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ieee80211/Kconfig')
| -rw-r--r-- | net/ieee80211/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index d18ccba3ea9e..dbb08528ddf5 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig @@ -66,3 +66,4 @@ config IEEE80211_CRYPT_TKIP This can be compiled as a modules and it will be called "ieee80211_crypt_tkip". +source "net/ieee80211/softmac/Kconfig" |
