diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /disk | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
| download | u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2 | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"WIP/20May2024-next
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
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, 2 insertions, 7 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index efe4bf1..ee3cc44 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -8,7 +8,6 @@ #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 2bee669..bc93252 100644 --- a/disk/part.c +++ b/disk/part.c @@ -4,7 +4,6 @@ * 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 65e30fe..9b0f2fe 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 567ead7..e6b5295 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 4ce9243..b1a03bd 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -12,7 +12,6 @@ #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 6ac6d95..6e05b2f 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -4,7 +4,6 @@ * 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 db5e203..81a6582 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -12,7 +12,6 @@ * 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> |