diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:27:35 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:27:35 +0000 |
| commit | 88619527b420481f832828af92fd0d96b6367fbf (patch) | |
| tree | 3575d98f9b8dbb9cef85c0b1f69528f32164ac29 /arch/arm64/include | |
| parent | 79eb42b269d425ec9c9e1d0613f62b273026de78 (diff) | |
| parent | 97ba4416d6dd53c4202038ee7d86dfb29774e00f (diff) | |
Merge branch 'for-next/kbuild' into for-next/core
* for-next/kbuild:
efi/libstub: zboot: do not use $(shell ...) in cmd_copy_and_pad
arm64: properly install vmlinuz.efi
arm64: replace <asm-generic/export.h> with <linux/export.h>
arm64: vdso32: rename 32-bit debug vdso to vdso32.so.dbg
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 376a980f2bad..7b1975bf4b90 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -12,7 +12,7 @@ #ifndef __ASM_ASSEMBLER_H #define __ASM_ASSEMBLER_H -#include <asm-generic/export.h> +#include <linux/export.h> #include <asm/alternative.h> #include <asm/asm-bug.h> |