diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /include/init.h | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'include/init.h')
| -rw-r--r-- | include/init.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/init.h b/include/init.h index 88f84599e9e..fd51d7f9667 100644 --- a/include/init.h +++ b/include/init.h @@ -10,16 +10,16 @@ #ifndef __INIT_H_ #define __INIT_H_ 1 -#include <linux/types.h> - -struct global_data; - #ifndef __ASSEMBLY__ /* put C only stuff in this section */ +#include <linux/types.h> + /* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ #ifdef CONFIG_EFI_STUB #define ll_boot_init() false #else +#include <asm/global_data.h> + #define ll_boot_init() (!(gd->flags & GD_FLG_SKIP_LL_INIT)) #endif |