diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /drivers/bios_emulator | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip | |
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 'drivers/bios_emulator')
| -rw-r--r-- | drivers/bios_emulator/atibios.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/besys.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/bios.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/biosemu.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/debug.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/decode.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/ops.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/ops2.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/prim_ops.c | 1 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/sys.c | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c index d544ffb5ff..7ebead6bfa 100644 --- a/drivers/bios_emulator/atibios.c +++ b/drivers/bios_emulator/atibios.c @@ -45,6 +45,7 @@ * Jason ported this file to u-boot to run the ATI video card * BIOS in u-boot. ****************************************************************************/ +#include <common.h> #include <compiler.h> #include <bios_emul.h> #include <errno.h> diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c index 690fb5a4d7..02c4286a85 100644 --- a/drivers/bios_emulator/besys.c +++ b/drivers/bios_emulator/besys.c @@ -48,6 +48,7 @@ ****************************************************************************/ #define __io +#include <common.h> #include <asm/io.h> #include "biosemui.h" diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c index 7f883daf8f..9596a1fdd3 100644 --- a/drivers/bios_emulator/bios.c +++ b/drivers/bios_emulator/bios.c @@ -42,6 +42,7 @@ ****************************************************************************/ #define __io +#include <common.h> #include <asm/io.h> #include "biosemui.h" diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c index ba4328474c..82befbae66 100644 --- a/drivers/bios_emulator/biosemu.c +++ b/drivers/bios_emulator/biosemu.c @@ -46,6 +46,7 @@ ****************************************************************************/ #include <malloc.h> +#include <common.h> #include "biosemui.h" BE_sysEnv _BE_env = {{0}}; diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c index b426dc3bc4..95f3cc09aa 100644 --- a/drivers/bios_emulator/x86emu/debug.c +++ b/drivers/bios_emulator/x86emu/debug.c @@ -38,6 +38,7 @@ ****************************************************************************/ #include <stdarg.h> +#include <common.h> #include <linux/ctype.h> #include <linux/printk.h> #include "x86emu/x86emui.h" diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c index 7e188d58a5..e2028eaf08 100644 --- a/drivers/bios_emulator/x86emu/decode.c +++ b/drivers/bios_emulator/x86emu/decode.c @@ -36,6 +36,7 @@ * instruction decoding and accessess of immediate data via IP. etc. * ****************************************************************************/ +#include <common.h> #include <linux/printk.h> #include "x86emu/x86emui.h" diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c index 57422ec3d4..8c1a146165 100644 --- a/drivers/bios_emulator/x86emu/ops.c +++ b/drivers/bios_emulator/x86emu/ops.c @@ -72,6 +72,7 @@ * ****************************************************************************/ +#include <common.h> #include <linux/printk.h> #include "x86emu/x86emui.h" diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c index 32fecb3479..6cd1ac3982 100644 --- a/drivers/bios_emulator/x86emu/ops2.c +++ b/drivers/bios_emulator/x86emu/ops2.c @@ -41,6 +41,7 @@ * ****************************************************************************/ +#include <common.h> #include <linux/compiler.h> #include <linux/printk.h> #include "x86emu/x86emui.h" diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c index b3cccb17f2..5f6c795fb7 100644 --- a/drivers/bios_emulator/x86emu/prim_ops.c +++ b/drivers/bios_emulator/x86emu/prim_ops.c @@ -97,6 +97,7 @@ * ****************************************************************************/ +#include <common.h> #define PRIM_OPS_NO_REDEFINE_ASM #include "x86emu/x86emui.h" diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c index 483ecd52ef..f96652415c 100644 --- a/drivers/bios_emulator/x86emu/sys.c +++ b/drivers/bios_emulator/x86emu/sys.c @@ -39,6 +39,7 @@ * ****************************************************************************/ +#include <common.h> #include <linux/printk.h> #include "x86emu/x86emui.h" |