summaryrefslogtreecommitdiff
path: root/nuttx/drivers
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-21 18:01:07 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-21 18:01:07 +0000
commit620e6ff88867894e87e423777470b96cc322e2d3 (patch)
tree49b04c6302cb3eb451491553f4e767f1a1a66bfa /nuttx/drivers
parentd6058d6314dee58f85a70287f01dfc399f8c45e8 (diff)
downloadpx4-nuttx-620e6ff88867894e87e423777470b96cc322e2d3.tar.gz
px4-nuttx-620e6ff88867894e87e423777470b96cc322e2d3.tar.bz2
px4-nuttx-620e6ff88867894e87e423777470b96cc322e2d3.zip
Move file-system header files to include/nuttx/fs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4499 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rw-r--r--nuttx/drivers/README.txt6
-rw-r--r--nuttx/drivers/analog/adc.c2
-rw-r--r--nuttx/drivers/analog/dac.c2
-rw-r--r--nuttx/drivers/bch/bch_internal.h2
-rw-r--r--nuttx/drivers/bch/bchdev_driver.c4
-rw-r--r--nuttx/drivers/bch/bchdev_unregister.c4
-rw-r--r--nuttx/drivers/bch/bchlib_cache.c2
-rw-r--r--nuttx/drivers/bch/bchlib_read.c2
-rw-r--r--nuttx/drivers/bch/bchlib_setup.c2
-rw-r--r--nuttx/drivers/bch/bchlib_teardown.c2
-rw-r--r--nuttx/drivers/bch/bchlib_write.c2
-rw-r--r--nuttx/drivers/can.c2
-rw-r--r--nuttx/drivers/dev_null.c2
-rw-r--r--nuttx/drivers/dev_zero.c2
-rw-r--r--nuttx/drivers/input/ads7843e.c2
-rw-r--r--nuttx/drivers/input/tsc2007.c2
-rw-r--r--nuttx/drivers/loop.c2
-rw-r--r--nuttx/drivers/mmcsd/mmcsd_sdio.c4
-rw-r--r--nuttx/drivers/mmcsd/mmcsd_spi.c2
-rw-r--r--nuttx/drivers/mtd/at24xx.c2
-rw-r--r--nuttx/drivers/mtd/at45db.c2
-rw-r--r--nuttx/drivers/mtd/flash_eraseall.c4
-rw-r--r--nuttx/drivers/mtd/ftl.c4
-rw-r--r--nuttx/drivers/mtd/m25px.c2
-rw-r--r--nuttx/drivers/mtd/rammtd.c2
-rw-r--r--nuttx/drivers/mtd/ramtron.c2
-rw-r--r--nuttx/drivers/mtd/skeleton.c2
-rw-r--r--nuttx/drivers/pipes/fifo.c2
-rw-r--r--nuttx/drivers/pipes/pipe.c2
-rw-r--r--nuttx/drivers/pipes/pipe_common.c2
-rw-r--r--nuttx/drivers/power/battery.c2
-rw-r--r--nuttx/drivers/pwm.c2
-rw-r--r--nuttx/drivers/ramdisk.c2
-rw-r--r--nuttx/drivers/ramlog.c4
-rw-r--r--nuttx/drivers/sensors/lm75.c2
-rw-r--r--nuttx/drivers/sensors/qencoder.c2
-rw-r--r--nuttx/drivers/serial/lowconsole.c2
-rw-r--r--nuttx/drivers/serial/serial.c2
-rw-r--r--nuttx/drivers/serial/uart_16550.c2
-rw-r--r--nuttx/drivers/usbdev/usbmsc.c2
-rw-r--r--nuttx/drivers/usbdev/usbmsc.h4
-rw-r--r--nuttx/drivers/usbhost/usbhost_hidkbd.c2
-rw-r--r--nuttx/drivers/usbhost/usbhost_skeleton.c2
-rw-r--r--nuttx/drivers/usbhost/usbhost_storage.c2
44 files changed, 53 insertions, 53 deletions
diff --git a/nuttx/drivers/README.txt b/nuttx/drivers/README.txt
index 9bde312f4..584edc4dd 100644
--- a/nuttx/drivers/README.txt
+++ b/nuttx/drivers/README.txt
@@ -17,14 +17,14 @@ can.c
dev_null.c and dev_zero.c
These files provide the standard /dev/null and /dev/zero devices.
- See include/nuttx/fs.h for functions that should be called if you
+ See include/nuttx/fs/fs.h for functions that should be called if you
want to register these devices (devnull_register() and
devzero_register()).
loop.c
Supports the standard loop device that can be used to export a
file (or character device) as a block device. See losetup() and
- loteardown() in include/nuttx/fs.h.
+ loteardown() in include/nuttx/fs/fs.h.
ramdisk.c
Can be used to set up a block of memory or (read-only) FLASH as
@@ -60,7 +60,7 @@ analog/
bch/
Contains logic that may be used to convert a block driver into
a character driver. This is the complementary conversion as that
- performed by loop.c. See include/nuttx/fs.h for registration
+ performed by loop.c. See include/nuttx/fs/fs.h for registration
information.
analog/
diff --git a/nuttx/drivers/analog/adc.c b/nuttx/drivers/analog/adc.c
index 8ba84116f..84070f162 100644
--- a/nuttx/drivers/analog/adc.c
+++ b/nuttx/drivers/analog/adc.c
@@ -55,7 +55,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
diff --git a/nuttx/drivers/analog/dac.c b/nuttx/drivers/analog/dac.c
index b283a5bf5..9371e3414 100644
--- a/nuttx/drivers/analog/dac.c
+++ b/nuttx/drivers/analog/dac.c
@@ -55,7 +55,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/analog/dac.h>
diff --git a/nuttx/drivers/bch/bch_internal.h b/nuttx/drivers/bch/bch_internal.h
index c24eeebbd..ffda8151e 100644
--- a/nuttx/drivers/bch/bch_internal.h
+++ b/nuttx/drivers/bch/bch_internal.h
@@ -46,7 +46,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <semaphore.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/drivers/bch/bchdev_driver.c b/nuttx/drivers/bch/bchdev_driver.c
index c57a5cd31..c80701449 100644
--- a/nuttx/drivers/bch/bchdev_driver.c
+++ b/nuttx/drivers/bch/bchdev_driver.c
@@ -55,8 +55,8 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchdev_unregister.c b/nuttx/drivers/bch/bchdev_unregister.c
index c54b5b005..0532ff4aa 100644
--- a/nuttx/drivers/bch/bchdev_unregister.c
+++ b/nuttx/drivers/bch/bchdev_unregister.c
@@ -49,8 +49,8 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchlib_cache.c b/nuttx/drivers/bch/bchlib_cache.c
index 3e2887c94..e7eca9bff 100644
--- a/nuttx/drivers/bch/bchlib_cache.c
+++ b/nuttx/drivers/bch/bchlib_cache.c
@@ -45,7 +45,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchlib_read.c b/nuttx/drivers/bch/bchlib_read.c
index e146f02f8..0f880ab2a 100644
--- a/nuttx/drivers/bch/bchlib_read.c
+++ b/nuttx/drivers/bch/bchlib_read.c
@@ -46,7 +46,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchlib_setup.c b/nuttx/drivers/bch/bchlib_setup.c
index b97b63dd2..00a2eada8 100644
--- a/nuttx/drivers/bch/bchlib_setup.c
+++ b/nuttx/drivers/bch/bchlib_setup.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchlib_teardown.c b/nuttx/drivers/bch/bchlib_teardown.c
index e2084125c..a0c659252 100644
--- a/nuttx/drivers/bch/bchlib_teardown.c
+++ b/nuttx/drivers/bch/bchlib_teardown.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/bch/bchlib_write.c b/nuttx/drivers/bch/bchlib_write.c
index 956f1619f..fcba9ede8 100644
--- a/nuttx/drivers/bch/bchlib_write.c
+++ b/nuttx/drivers/bch/bchlib_write.c
@@ -47,7 +47,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "bch_internal.h"
diff --git a/nuttx/drivers/can.c b/nuttx/drivers/can.c
index 3c9ea28fc..2c1567781 100644
--- a/nuttx/drivers/can.c
+++ b/nuttx/drivers/can.c
@@ -50,7 +50,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/can.h>
diff --git a/nuttx/drivers/dev_null.c b/nuttx/drivers/dev_null.c
index f473f1b87..c2b523bcb 100644
--- a/nuttx/drivers/dev_null.c
+++ b/nuttx/drivers/dev_null.c
@@ -44,7 +44,7 @@
#include <string.h>
#include <poll.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
/****************************************************************************
* Private Function Prototypes
diff --git a/nuttx/drivers/dev_zero.c b/nuttx/drivers/dev_zero.c
index c4b453798..23a2078f5 100644
--- a/nuttx/drivers/dev_zero.c
+++ b/nuttx/drivers/dev_zero.c
@@ -44,7 +44,7 @@
#include <string.h>
#include <poll.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
/****************************************************************************
* Private Function Prototypes
diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index 52d871dd5..ed42e2275 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -60,7 +60,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/spi.h>
#include <nuttx/wqueue.h>
diff --git a/nuttx/drivers/input/tsc2007.c b/nuttx/drivers/input/tsc2007.c
index 52f8652a7..dcf743821 100644
--- a/nuttx/drivers/input/tsc2007.c
+++ b/nuttx/drivers/input/tsc2007.c
@@ -64,7 +64,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/wqueue.h>
diff --git a/nuttx/drivers/loop.c b/nuttx/drivers/loop.c
index 77cb9daf6..322a421b5 100644
--- a/nuttx/drivers/loop.c
+++ b/nuttx/drivers/loop.c
@@ -57,7 +57,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c
index 20ef3ebe6..90c73261a 100644
--- a/nuttx/drivers/mmcsd/mmcsd_sdio.c
+++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c
@@ -54,8 +54,8 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/clock.h>
#include <nuttx/arch.h>
#include <nuttx/rwbuffer.h>
diff --git a/nuttx/drivers/mmcsd/mmcsd_spi.c b/nuttx/drivers/mmcsd/mmcsd_spi.c
index b5f5829a2..f7bbd64b4 100644
--- a/nuttx/drivers/mmcsd/mmcsd_spi.c
+++ b/nuttx/drivers/mmcsd/mmcsd_spi.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
#include <nuttx/clock.h>
#include <nuttx/spi.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mmcsd.h>
#include "mmcsd_spi.h"
diff --git a/nuttx/drivers/mtd/at24xx.c b/nuttx/drivers/mtd/at24xx.c
index 67d7f1f52..d157a9c47 100644
--- a/nuttx/drivers/mtd/at24xx.c
+++ b/nuttx/drivers/mtd/at24xx.c
@@ -58,7 +58,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/i2c.h>
#include <nuttx/mtd.h>
diff --git a/nuttx/drivers/mtd/at45db.c b/nuttx/drivers/mtd/at45db.c
index fab9d0d9b..037cc5e76 100644
--- a/nuttx/drivers/mtd/at45db.c
+++ b/nuttx/drivers/mtd/at45db.c
@@ -61,7 +61,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/spi.h>
#include <nuttx/mtd.h>
diff --git a/nuttx/drivers/mtd/flash_eraseall.c b/nuttx/drivers/mtd/flash_eraseall.c
index 5f607da35..77666ff03 100644
--- a/nuttx/drivers/mtd/flash_eraseall.c
+++ b/nuttx/drivers/mtd/flash_eraseall.c
@@ -42,8 +42,8 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
/****************************************************************************
diff --git a/nuttx/drivers/mtd/ftl.c b/nuttx/drivers/mtd/ftl.c
index f01a19470..bf6d1e739 100644
--- a/nuttx/drivers/mtd/ftl.c
+++ b/nuttx/drivers/mtd/ftl.c
@@ -50,8 +50,8 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
#include <nuttx/rwbuffer.h>
diff --git a/nuttx/drivers/mtd/m25px.c b/nuttx/drivers/mtd/m25px.c
index 3c4229b95..1c242875f 100644
--- a/nuttx/drivers/mtd/m25px.c
+++ b/nuttx/drivers/mtd/m25px.c
@@ -49,7 +49,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/spi.h>
#include <nuttx/mtd.h>
diff --git a/nuttx/drivers/mtd/rammtd.c b/nuttx/drivers/mtd/rammtd.c
index c50db6a3a..72acc73e8 100644
--- a/nuttx/drivers/mtd/rammtd.c
+++ b/nuttx/drivers/mtd/rammtd.c
@@ -47,7 +47,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
/****************************************************************************
diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c
index a59a94bb4..0c922e69e 100644
--- a/nuttx/drivers/mtd/ramtron.c
+++ b/nuttx/drivers/mtd/ramtron.c
@@ -67,7 +67,7 @@
#include <assert.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/spi.h>
#include <nuttx/mtd.h>
diff --git a/nuttx/drivers/mtd/skeleton.c b/nuttx/drivers/mtd/skeleton.c
index 8b09b5c15..673ddadb3 100644
--- a/nuttx/drivers/mtd/skeleton.c
+++ b/nuttx/drivers/mtd/skeleton.c
@@ -43,7 +43,7 @@
#include <stdint.h>
#include <errno.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
/****************************************************************************
diff --git a/nuttx/drivers/pipes/fifo.c b/nuttx/drivers/pipes/fifo.c
index 9e663b4a8..951a4e04e 100644
--- a/nuttx/drivers/pipes/fifo.c
+++ b/nuttx/drivers/pipes/fifo.c
@@ -41,7 +41,7 @@
#include <sys/types.h>
#include <stdint.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <errno.h>
#include "pipe_common.h"
diff --git a/nuttx/drivers/pipes/pipe.c b/nuttx/drivers/pipes/pipe.c
index 541f3bda4..5ca72e640 100644
--- a/nuttx/drivers/pipes/pipe.c
+++ b/nuttx/drivers/pipes/pipe.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <stdio.h>
#include <unistd.h>
#include <semaphore.h>
diff --git a/nuttx/drivers/pipes/pipe_common.c b/nuttx/drivers/pipes/pipe_common.c
index 52077beed..0282d8acd 100644
--- a/nuttx/drivers/pipes/pipe_common.c
+++ b/nuttx/drivers/pipes/pipe_common.c
@@ -53,7 +53,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#if CONFIG_DEBUG
# include <nuttx/arch.h>
#endif
diff --git a/nuttx/drivers/power/battery.c b/nuttx/drivers/power/battery.c
index 70337b5cb..698e5571b 100644
--- a/nuttx/drivers/power/battery.c
+++ b/nuttx/drivers/power/battery.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/power/battery.h>
/* This driver requires:
diff --git a/nuttx/drivers/pwm.c b/nuttx/drivers/pwm.c
index adfe0e2e8..78b800634 100644
--- a/nuttx/drivers/pwm.c
+++ b/nuttx/drivers/pwm.c
@@ -55,7 +55,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/pwm.h>
diff --git a/nuttx/drivers/ramdisk.c b/nuttx/drivers/ramdisk.c
index bfa0618d6..0a6a7b714 100644
--- a/nuttx/drivers/ramdisk.c
+++ b/nuttx/drivers/ramdisk.c
@@ -50,7 +50,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/ramdisk.h>
/****************************************************************************
diff --git a/nuttx/drivers/ramlog.c b/nuttx/drivers/ramlog.c
index c6bb07b15..775d03ec8 100644
--- a/nuttx/drivers/ramlog.c
+++ b/nuttx/drivers/ramlog.c
@@ -52,9 +52,9 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/ramlog.h>
diff --git a/nuttx/drivers/sensors/lm75.c b/nuttx/drivers/sensors/lm75.c
index 397cb9582..cd83f645b 100644
--- a/nuttx/drivers/sensors/lm75.c
+++ b/nuttx/drivers/sensors/lm75.c
@@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/sensors/lm75.h>
diff --git a/nuttx/drivers/sensors/qencoder.c b/nuttx/drivers/sensors/qencoder.c
index 84bc15813..a56adec9a 100644
--- a/nuttx/drivers/sensors/qencoder.c
+++ b/nuttx/drivers/sensors/qencoder.c
@@ -55,7 +55,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/sensors/qencoder.h>
diff --git a/nuttx/drivers/serial/lowconsole.c b/nuttx/drivers/serial/lowconsole.c
index 2c7d639e2..1fac49a57 100644
--- a/nuttx/drivers/serial/lowconsole.c
+++ b/nuttx/drivers/serial/lowconsole.c
@@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
/****************************************************************************
* Definitions
diff --git a/nuttx/drivers/serial/serial.c b/nuttx/drivers/serial/serial.c
index 2d09574f9..43f3cd8e0 100644
--- a/nuttx/drivers/serial/serial.c
+++ b/nuttx/drivers/serial/serial.c
@@ -52,7 +52,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/serial.h>
/************************************************************************************
diff --git a/nuttx/drivers/serial/uart_16550.c b/nuttx/drivers/serial/uart_16550.c
index 07c0dae36..201751dd0 100644
--- a/nuttx/drivers/serial/uart_16550.c
+++ b/nuttx/drivers/serial/uart_16550.c
@@ -52,7 +52,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/serial.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/uart_16550.h>
#include <arch/board/board.h>
diff --git a/nuttx/drivers/usbdev/usbmsc.c b/nuttx/drivers/usbdev/usbmsc.c
index 51caeb431..3c17bfd66 100644
--- a/nuttx/drivers/usbdev/usbmsc.c
+++ b/nuttx/drivers/usbdev/usbmsc.c
@@ -74,7 +74,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/storage.h>
#include <nuttx/usb/usbdev.h>
diff --git a/nuttx/drivers/usbdev/usbmsc.h b/nuttx/drivers/usbdev/usbmsc.h
index 4400a3392..4b0817248 100644
--- a/nuttx/drivers/usbdev/usbmsc.h
+++ b/nuttx/drivers/usbdev/usbmsc.h
@@ -50,7 +50,7 @@
#include <pthread.h>
#include <queue.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/usb/storage.h>
#include <nuttx/usb/usbdev.h>
@@ -424,7 +424,7 @@ enum usbmsc_epdesc_e
struct usbmsc_req_s
{
- FAR struct usbmsc_req_s *flink; /* Implements a singly linked list */
+ FAR struct usbmsc_req_s *flink; /* Implements a singly linked list */
FAR struct usbdev_req_s *req; /* The contained request */
};
diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c
index baf18703d..ce951e1e6 100644
--- a/nuttx/drivers/usbhost/usbhost_hidkbd.c
+++ b/nuttx/drivers/usbhost/usbhost_hidkbd.c
@@ -54,7 +54,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/wqueue.h>
diff --git a/nuttx/drivers/usbhost/usbhost_skeleton.c b/nuttx/drivers/usbhost/usbhost_skeleton.c
index 206b347c5..0a88a4f1b 100644
--- a/nuttx/drivers/usbhost/usbhost_skeleton.c
+++ b/nuttx/drivers/usbhost/usbhost_skeleton.c
@@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/wqueue.h>
diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c
index 82409eac3..2817c2446 100644
--- a/nuttx/drivers/usbhost/usbhost_storage.c
+++ b/nuttx/drivers/usbhost/usbhost_storage.c
@@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/wqueue.h>
#include <nuttx/scsi.h>