Merge branch 'cfq-merge' of git://brick.kernel.dk/data/git/linux-2.6-block

[powerpc.git] / net / ieee80211 / Kconfig

diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index d18ccba..dbb0852 100644 (file)
--- 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"