diff options
author | Chen-Yu Tsai <wens@csie.org> | 2025-07-15 23:34:10 +0800 |
---|---|---|
committer | Chen-Yu Tsai <wens@csie.org> | 2025-07-15 23:34:10 +0800 |
commit | ca5ad734d30f30a577f705926d6e16a87513a2a7 (patch) | |
tree | b5fb169a86ac59892bd3b60c2df13e8a7cef360d /arch/arc/include/asm/processor.h | |
parent | 082c6a2d06c0831d236760a29953355845eee988 (diff) | |
parent | f99d4fccd2185176baf4ecac9a49d280fc62b953 (diff) |
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into sunxi/dt-for-6.17
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'arch/arc/include/asm/processor.h')
-rw-r--r-- | arch/arc/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index d606658e2fe7..7f7901ac6643 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -11,7 +11,7 @@ #ifndef __ASM_ARC_PROCESSOR_H #define __ASM_ARC_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <asm/ptrace.h> #include <asm/dsp.h> @@ -66,7 +66,7 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc, extern unsigned int __get_wchan(struct task_struct *p); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* * Default System Memory Map on ARC |