7 files changed, 15 insertions, 15 deletions
diff --git a/drivers/usb/gadget/function/dfu.c b/drivers/usb/gadget/function/dfu.c
index 0b7ca82c4a..930a10b766 100644
--- a/drivers/usb/gadget/function/dfu.c
+++ b/drivers/usb/gadget/function/dfu.c
@@ -26,15 +26,15 @@
 
 #include <dma.h>
 #include <asm/byteorder.h>
-#include <usb/composite.h>
+#include <linux/usb/composite.h>
 #include <linux/types.h>
 #include <linux/list.h>
-#include <usb/gadget.h>
+#include <linux/usb/gadget.h>
 #include <linux/stat.h>
 #include <libfile.h>
 #include <linux/err.h>
-#include <usb/ch9.h>
-#include <usb/dfu.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/dfu.h>
 #include <config.h>
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 3d2595edd7..1210622d96 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -12,11 +12,11 @@
 /* #define VERBOSE_DEBUG */
 
 #include <common.h>
-#include <usb/cdc.h>
+#include <linux/usb/cdc.h>
 #include <linux/err.h>
 #include <linux/spinlock.h>
 #include <asm/byteorder.h>
-#include <usb/composite.h>
+#include <linux/usb/composite.h>
 
 #include "u_serial.h"
 
diff --git a/drivers/usb/gadget/function/f_fastboot.c b/drivers/usb/gadget/function/f_fastboot.c
index 078b37ce54..499262a64b 100644
--- a/drivers/usb/gadget/function/f_fastboot.c
+++ b/drivers/usb/gadget/function/f_fastboot.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <progress.h>
 #include <fastboot.h>
-#include <usb/fastboot.h>
+#include <linux/usb/fastboot.h>
 
 #define FASTBOOT_INTERFACE_CLASS	0xff
 #define FASTBOOT_INTERFACE_SUB_CLASS	0x42
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index 1c26c4d996..61f369bd07 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -225,12 +225,12 @@
 #include <scsi.h>
 
 #include <linux/err.h>
-#include <usb/mass_storage.h>
+#include <linux/usb/mass_storage.h>
 
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
-#include <usb/gadget.h>
-#include <usb/composite.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/composite.h>
 #include <linux/bitmap.h>
 #include <linux/completion.h>
 #include <bthread.h>
diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h
index bd499c9e03..3b98c82ee3 100644
--- a/drivers/usb/gadget/function/storage_common.h
+++ b/drivers/usb/gadget/function/storage_common.h
@@ -4,9 +4,9 @@
 #define USB_STORAGE_COMMON_H
 
 #include <driver.h>
-#include <usb/storage.h>
+#include <linux/usb/storage.h>
 #include <asm/unaligned.h>
-#include <usb/mass_storage.h>
+#include <linux/usb/mass_storage.h>
 
 #ifndef DEBUG
 #undef VERBOSE_DEBUG
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 2ce3f1c791..ac7a0b589d 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -16,7 +16,7 @@
 
 #include <common.h>
 #include <complete.h>
-#include <usb/cdc.h>
+#include <linux/usb/cdc.h>
 #include <kfifo.h>
 #include <clock.h>
 #include <linux/err.h>
diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h
index 80450ccc86..44fcace030 100644
--- a/drivers/usb/gadget/function/u_serial.h
+++ b/drivers/usb/gadget/function/u_serial.h
@@ -9,8 +9,8 @@
 #ifndef __U_SERIAL_H
 #define __U_SERIAL_H
 
-#include <usb/composite.h>
-#include <usb/cdc.h>
+#include <linux/usb/composite.h>
+#include <linux/usb/cdc.h>
 
 #define MAX_U_SERIAL_PORTS	4