From: Olof Johansson Date: Mon, 19 Jun 2017 06:12:36 +0000 (-0700) Subject: Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni... X-Git-Tag: v4.13-rc1~169^2~5 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=17bc093e18a6e7c453ebbfff81c74531e7933897;p=linux-block.git Merge tag 'at91-4.12-fixes' of git://git./linux/kernel/git/abelloni/linux into next/soc Bring in the fixes branch to avoid a merge conflict between new SoC options and the build fix adding CONFIG_AMR_CPU_SUSPEND. Fixes for 4.12: Fix two compilation issues * tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: select CONFIG_ARM_CPU_SUSPEND memory: atmel-ebi: mark PM ops as __maybe_unused Signed-off-by: Olof Johansson --- 17bc093e18a6e7c453ebbfff81c74531e7933897 diff --cc arch/arm/mach-at91/Kconfig index 7497a28a79d1,cbd959b73654..d735e5fc4772 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@@ -1,6 -1,7 +1,7 @@@ menuconfig ARCH_AT91 bool "Atmel SoCs" - depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 + depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M + select ARM_CPU_SUSPEND if PM select COMMON_CLK_AT91 select GPIOLIB select PINCTRL