diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-19 08:59:15 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-19 08:59:15 +0200 |
commit | e0f1115ebb757cebbc0cf7dd92a586e3dad19b77 (patch) | |
tree | f694ff849990cbfa962f49954266b5aa6eadf7eb /commands | |
parent | d5a06d4800305af6740cde3894d8f4b65b26b392 (diff) | |
parent | 0a73158341d5d3ef1e79e0d77a177121ef502930 (diff) | |
download | barebox-e0f1115ebb757cebbc0cf7dd92a586e3dad19b77.tar.gz barebox-e0f1115ebb757cebbc0cf7dd92a586e3dad19b77.tar.xz |
Merge branch 'for-next/usb'
Diffstat (limited to 'commands')
-rw-r--r-- | commands/dfu.c | 4 | ||||
-rw-r--r-- | commands/usb.c | 2 | ||||
-rw-r--r-- | commands/usbgadget.c | 6 | ||||
-rw-r--r-- | commands/usbserial.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/commands/dfu.c b/commands/dfu.c index 1734947fe0..2116747f68 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -10,8 +10,8 @@ #include <getopt.h> #include <fs.h> #include <xfuncs.h> -#include <usb/dfu.h> -#include <usb/gadget-multi.h> +#include <linux/usb/dfu.h> +#include <linux/usb/gadget-multi.h> #include <linux/err.h> /* dfu /dev/self0(bootloader)sr,/dev/nand0.root.bb(root) diff --git a/commands/usb.c b/commands/usb.c index ca8d3e0d52..0588ba6968 100644 --- a/commands/usb.c +++ b/commands/usb.c @@ -6,7 +6,7 @@ #include <common.h> #include <command.h> #include <complete.h> -#include <usb/usb.h> +#include <linux/usb/usb.h> #include <getopt.h> /* shows the device tree recursively */ diff --git a/commands/usbgadget.c b/commands/usbgadget.c index 290f33eff3..d0dcde69ce 100644 --- a/commands/usbgadget.c +++ b/commands/usbgadget.c @@ -12,9 +12,9 @@ #include <getopt.h> #include <fs.h> #include <xfuncs.h> -#include <usb/usbserial.h> -#include <usb/dfu.h> -#include <usb/gadget-multi.h> +#include <linux/usb/usbserial.h> +#include <linux/usb/dfu.h> +#include <linux/usb/gadget-multi.h> static int do_usbgadget(int argc, char *argv[]) { diff --git a/commands/usbserial.c b/commands/usbserial.c index 567018c233..17a4afec42 100644 --- a/commands/usbserial.c +++ b/commands/usbserial.c @@ -11,7 +11,7 @@ #include <getopt.h> #include <fs.h> #include <xfuncs.h> -#include <usb/usbserial.h> +#include <linux/usb/usbserial.h> static int do_usbserial(int argc, char *argv[]) { |