diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-10-13 17:18:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-10-13 17:51:35 +0200 |
| commit | dfd4ce487c16efc69efa8660f44638b05c10a828 (patch) | |
| tree | 47c45f7d8e821b8d7a3958ec28b79d83daa787ef /arch | |
| parent | 41eb191bcd8fc1842d385327c21e75a4714749af (diff) | |
| parent | b847099fdcc855b04b017a67bd6d3097ce277175 (diff) | |
Merge tag 'at91-soc-7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm
Microchip AT91 SoC updates for v7.4
This update includes:
- replace __ASSEMBLY__ with __ASSEMBLER__ to avoid confusion
- use of_machine_device_match() instead of open-coding it
* tag 'at91-soc-7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
soc: atmel: Convert to of_machine_device_match()
ARM: at91: Replace __ASSEMBLY__ with __ASSEMBLER__
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 50c3a425d140..2193e1ab9847 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -25,7 +25,7 @@ #define AT91_PM_ULP1 0x03 #define AT91_PM_BACKUP 0x04 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct at91_pm_data { void __iomem *pmc; void __iomem *ramc[2]; |