diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
tree | 420073c8a29a401a3908803000df6f54673e1731 /disk | |
parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
download | u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.zip u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.gz u-boot-d4781422d1268aa6deca3e49d2fb227e79c160b4.tar.bz2 |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'disk')
-rw-r--r-- | disk/disk-uclass.c | 1 | ||||
-rw-r--r-- | disk/part.c | 1 | ||||
-rw-r--r-- | disk/part_amiga.c | 2 | ||||
-rw-r--r-- | disk/part_dos.c | 2 | ||||
-rw-r--r-- | disk/part_efi.c | 1 | ||||
-rw-r--r-- | disk/part_iso.c | 1 | ||||
-rw-r--r-- | disk/part_mac.c | 1 |
7 files changed, 7 insertions, 2 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index ee3cc44..efe4bf1 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY UCLASS_PARTITION +#include <common.h> #include <blk.h> #include <dm.h> #include <log.h> diff --git a/disk/part.c b/disk/part.c index bc93252..2bee669 100644 --- a/disk/part.c +++ b/disk/part.c @@ -4,6 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#include <common.h> #include <blk.h> #include <command.h> #include <env.h> diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 9b0f2fe..65e30fe 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -4,12 +4,12 @@ * Hans-Joerg Frieden, Hyperion Entertainment * Hans-JoergF@hyperion-entertainment.com */ +#include <common.h> #include <command.h> #include <env.h> #include <ide.h> #include "part_amiga.h" #include <part.h> -#include <vsprintf.h> #undef AMIGA_DEBUG diff --git a/disk/part_dos.c b/disk/part_dos.c index e6b5295..567ead7 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -13,11 +13,11 @@ * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92 */ +#include <common.h> #include <blk.h> #include <command.h> #include <ide.h> #include <memalign.h> -#include <vsprintf.h> #include <asm/unaligned.h> #include <linux/compiler.h> #include "part_dos.h" diff --git a/disk/part_efi.c b/disk/part_efi.c index b1a03bd..4ce9243 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -12,6 +12,7 @@ #define LOG_CATEGORY LOGC_FS +#include <common.h> #include <blk.h> #include <log.h> #include <part.h> diff --git a/disk/part_iso.c b/disk/part_iso.c index 6e05b2f..6ac6d95 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -4,6 +4,7 @@ * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch. */ +#include <common.h> #include <blk.h> #include <command.h> #include <part.h> diff --git a/disk/part_mac.c b/disk/part_mac.c index 81a6582..db5e203 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -12,6 +12,7 @@ * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92 */ +#include <common.h> #include <command.h> #include <log.h> #include <memalign.h> |