diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2022-05-27 15:56:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-27 15:56:30 +0200 |
| commit | fd82d925f206c5f4db72b1d2da62a2f8086096c5 (patch) | |
| tree | f69dd11d557e683a51f51aaef924e152e7a90c3a | |
| parent | ep93xx: clock: Do not return the address of the freed memory (diff) | |
| parent | ARM: at91: pm: Fix rand build error (diff) | |
| download | linux-dev-fd82d925f206c5f4db72b1d2da62a2f8086096c5.tar.xz linux-dev-fd82d925f206c5f4db72b1d2da62a2f8086096c5.zip | |
Merge tag 'at91-soc-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/late
AT91 SoC #2 for 5.19:
- One Kconfig fix for random build error
* tag 'at91-soc-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: at91: pm: Fix rand build error
Link: https://lore.kernel.org/r/20220517150832.89451-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 3d7e66976206..3dd9e718661b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -219,7 +219,7 @@ config SOC_SAMA5 select SRAM if PM config ATMEL_PM - bool "Atmel PM support" + bool config ATMEL_SECURE_PM bool "Atmel Secure PM support" |