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 /arch/m68k | |
| 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 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/global_data.h | 2 | ||||
| -rw-r--r-- | arch/m68k/lib/bdinfo.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index c2ef577..93efc72 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -7,6 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <asm/u-boot.h> + /* Architecture-specific global data */ struct arch_global_data { #ifdef CONFIG_SYS_I2C_FSL diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 3719f11..cf6ae5a 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/lib/bdinfo.c @@ -8,7 +8,6 @@ #include <config.h> #include <init.h> -#include <asm/u-boot.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; |