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 /arch/nios2/include | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.xz u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.zip | |
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 'arch/nios2/include')
| -rw-r--r-- | arch/nios2/include/asm/io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index 41e6bd4ee1..817cd72e00 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -7,6 +7,8 @@ #ifndef __ASM_NIOS2_IO_H_ #define __ASM_NIOS2_IO_H_ +#include <asm/global_data.h> + static inline void sync(void) { __asm__ __volatile__ ("sync" : : : "memory"); @@ -170,5 +172,6 @@ static inline void outsl (unsigned long port, const void *src, unsigned long cou #define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c)) #include <asm-generic/io.h> +#include <asm/global_data.h> #endif /* __ASM_NIOS2_IO_H_ */ |