X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2FKconfig;h=d789d79551ae4207d37e0b386a3db743dde05611;hb=6c5121b78ba5c70a9990e2af6cb4d6bbffe0d4d8;hp=7612cc8c337cc6ba7e909a08f6c63a3b026abf81;hpb=251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3;p=linux-2.6-omap-h63xx.git diff --git a/net/Kconfig b/net/Kconfig index 7612cc8c337..d789d79551a 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -180,6 +180,7 @@ source "net/tipc/Kconfig" source "net/atm/Kconfig" source "net/802/Kconfig" source "net/bridge/Kconfig" +source "net/dsa/Kconfig" source "net/8021q/Kconfig" source "net/decnet/Kconfig" source "net/llc/Kconfig" @@ -232,18 +233,23 @@ source "net/can/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/rxrpc/Kconfig" +source "net/phonet/Kconfig" config FIB_RULES bool -menu "Wireless" +menuconfig WIRELESS + bool "Wireless" depends on !S390 + default y + +if WIRELESS source "net/wireless/Kconfig" source "net/mac80211/Kconfig" source "net/ieee80211/Kconfig" -endmenu +endif # WIRELESS source "net/rfkill/Kconfig" source "net/9p/Kconfig"