diff options
| author | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 10:16:33 -0600 |
| commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
| tree | 420073c8a29a401a3908803000df6f54673e1731 /arch/microblaze | |
| parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
| parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/cpu/spl.c | 1 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/global_data.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index 52177670578..cb224bd2542 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -10,6 +10,7 @@ #include <log.h> #include <spl.h> #include <asm/io.h> +#include <asm/u-boot.h> #include <linux/stringify.h> void board_boot_order(u32 *spl_boot_list) diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index bb4112f22a3..93506dec894 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -9,7 +9,6 @@ #define __ASM_GBL_DATA_H #include <asm/cpuinfo.h> -#include <asm/u-boot.h> /* Architecture-specific global data */ struct arch_global_data { |