diff --git a/[refs] b/[refs]
index 944a98617020..2d9754c8d9a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7dc100374df0c21afd8a198336ecd7999697159
+refs/heads/master: 5442060c08a49bd0b416f033e0ae43ccedef5278
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index 7612cc8c337c..d87de48ba656 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -236,14 +236,18 @@ source "net/rxrpc/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"