diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-19 05:20:43 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 17:16:36 +0300 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /disk | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.xz | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
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, 7 insertions, 2 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index ee3cc4407d..efe4bf1f94 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 bc932526f9..2bee669582 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 9b0f2fe749..65e30fea55 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 e6b5295e0e..567ead7511 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 b1a03bd165..4ce9243ef2 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 6e05b2feff..6ac6d95be9 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 81a65823be..db5e203be5 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> |