commit abb9a04d0794c6d223d648898c021945de80a49a
author Tom Rini <trini@konsulko.com> Sat May 18 20:20:43 2024 -0600
committer Tom Rini <trini@konsulko.com> Sun May 19 08:16:36 2024 -0600
tree 313e5c32e3d02d3cf1904875b1655140973126e9
parent d4b57ec1d154916492fefd33ded0b3c2a7daff00

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>

disk/disk-uclass.c

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>

disk/part.c

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>

disk/part_amiga.c

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
 

disk/part_dos.c

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"

disk/part_efi.c

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>

disk/part_iso.c

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>

disk/part_mac.c

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>