diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
| commit | 53e0fef5a74ac10618da083a01bbf97b4387a3dd (patch) | |
| tree | 2e3d22c903796c967a4855a27f996b7705603c74 /arch/arm/include/asm/global_data.h | |
| parent | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (diff) | |
| parent | 2f7aa89703738b0c37e34120319bab567a8672bd (diff) | |
Merge branch '2021-02-24-assorted-fixes'
- squashfs, btrfs fixes
- Kconfig CONFIG logic fixes
- hikey DM migration
- Some portability fixes for the build system
- Assorted code cleanups
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 5a935d34e20..fba655f3b93 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -7,6 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#ifndef __ASSEMBLY__ + #include <asm/types.h> #include <linux/types.h> @@ -125,4 +127,6 @@ static inline void set_gd(volatile gd_t *gd_ptr) #endif } +#endif /* __ASSEMBLY__ */ + #endif /* __ASM_GBL_DATA_H */ |