diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-06-26 07:59:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-06-26 07:59:33 +0200 |
| commit | 346bd8a977fc559ef41099f727cdb0805f66bd10 (patch) | |
| tree | ea2304801566b4a498957a5be469be8e0cc51686 /arch/arc/include/asm/processor.h | |
| parent | 5e9571750c4e53d16727a04159455c693d7b31cb (diff) | |
| parent | 6c038b58a2dc5a008c7e7a1297f5aaa4deaaaa7e (diff) | |
Merge tag 'asoc-fix-v6.16-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.16
A small collection of fixes, the main one being a fix for resume from
hibernation on AMD systems, plus a few new quirk entries for AMD
systems.
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 |