summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-01 16:53:38 -0700
committerOlof Johansson <olof@lixom.net>2017-06-01 17:07:31 -0700
commitda3d1d4a4e6c554237466db060d53abbf0620605 (patch)
tree46470fc6ac21ecab88ff7eadc1946056f0dc1c89 /arch
parentcf5cde2199058f1aed33f8b5f637c02a95936031 (diff)
parentcc7a938f5f308eeb6f8fe3cec28e1800aa81facb (diff)
downloadlinux-da3d1d4a4e6c554237466db060d53abbf0620605.tar.gz
linux-da3d1d4a4e6c554237466db060d53abbf0620605.tar.bz2
linux-da3d1d4a4e6c554237466db060d53abbf0620605.zip
Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes
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 <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 841e924143f9..cbd959b73654 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,6 +1,7 @@
menuconfig ARCH_AT91
bool "Atmel SoCs"
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
+ select ARM_CPU_SUSPEND if PM
select COMMON_CLK_AT91
select GPIOLIB
select PINCTRL