diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index 11e2b684bd..81fd5ba703 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -584,6 +584,8 @@ CONFIG_USART4_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
diff --git a/fs/aio/aio.h b/fs/aio/aio.h
index 85a5161cb8..0f811e9ea1 100644
--- a/fs/aio/aio.h
+++ b/fs/aio/aio.h
@@ -49,6 +49,8 @@
 
 #include <nuttx/wqueue.h>
 
+#ifdef CONFIG_FS_AIO
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -250,4 +252,5 @@ int aio_queue(FAR struct aio_container_s *aioc, worker_t worker);
 
 int aio_signal(pid_t pid, FAR struct aiocb *aiocbp);
 
+#endif /* CONFIG_FS_AIO */
 #endif /* __FS_AIO_AIO_H */