diff --git a/Directories.mk b/Directories.mk
index 83cbb5f1ab8..dcf9fd65105 100644
--- a/Directories.mk
+++ b/Directories.mk
@@ -124,6 +124,12 @@ else
 OTHERDIRS += audio
 endif
 
+ifeq ($(CONFIG_DRIVERS_WIRELESS),y)
+NONFSDIRS += wireless
+else
+OTHERDIRS += wireless
+endif
+
 # CLEANDIRS are the directories that will clean in.  These are
 #   all directories that we know about.
 # KERNDEPDIRS are the directories in which we will build target dependencies.
diff --git a/configs b/configs
index 45657b1172f..bdb92a1d641 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 45657b1172f9cfe6bf72e6313eb98e2cce78ee39
+Subproject commit bdb92a1d64163ff9a7eb8fe842cf304a553c0f94
diff --git a/drivers/Kconfig b/drivers/Kconfig
index bef5458d4a5..172b3be85b8 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -550,15 +550,15 @@ if USBHOST
 source drivers/usbhost/Kconfig
 endif # USBHOST
 
-menuconfig WIRELESS
+menuconfig DRIVERS_WIRELESS
 	bool "Wireless Device Support"
 	default n
 	---help---
 		Drivers for various wireless devices.
 
-if WIRELESS
+if DRIVERS_WIRELESS
 source drivers/wireless/Kconfig
-endif # WIRELESS
+endif # DRIVERS_WIRELESS
 
 comment "System Logging Device Options"
 
diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs
index 23dcbdb8c81..be63caaa765 100644
--- a/drivers/wireless/Make.defs
+++ b/drivers/wireless/Make.defs
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_WIRELESS),y)
+ifeq ($(CONFIG_DRIVERS_WIRELESS),y)
 
 # Include IEEE 802.15.4 support
 
diff --git a/include/nuttx/wireless/cc3000/include/cc3000_upif.h b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
index 1240655ee15..26c2e109721 100644
--- a/include/nuttx/wireless/cc3000/include/cc3000_upif.h
+++ b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
@@ -56,7 +56,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/wireless/wireless.h>
 
-#if defined(CONFIG_WIRELESS) && defined(CONFIG_WL_CC3000)
+#if defined(CONFIG_DRIVERS_WIRELESS) && defined(CONFIG_WL_CC3000)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -188,5 +188,5 @@ int cc3000_register(FAR struct spi_dev_s *spi,
 }
 #endif
 
-#endif /* CONFIG_WIRELESS && CONFIG_INPUT_CC3000 */
+#endif /* CONFIG_DRIVERS_WIRELESS && CONFIG_INPUT_CC3000 */
 #endif /* __INCLUDE_NUTTX_WIRELESS_CC3000_INCLUDE_CC3000_UPIFL_H */
diff --git a/include/nuttx/wireless/wireless.h b/include/nuttx/wireless/wireless.h
index 67146c7416f..fd87265228d 100644
--- a/include/nuttx/wireless/wireless.h
+++ b/include/nuttx/wireless/wireless.h
@@ -47,7 +47,7 @@
 #include <nuttx/config.h>
 #include <nuttx/fs/ioctl.h>
 
-#ifdef CONFIG_WIRELESS
+#ifdef CONFIG_DRIVERS_WIRELESS
 
 /************************************************************************************
  * Pre-processor Definitions