Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[karo-tx-linux.git] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 5204395efda8d59db48e49d63d6a2c812687e4b2..cbd959b73654c43deb72cbe084bdb99043a22b66 100644 (file)
--- 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
@@ -55,7 +56,6 @@ config SOC_AT91RM9200
        select ATMEL_ST
        select CPU_ARM920T
        select HAVE_AT91_USB_CLK
-       select MIGHT_HAVE_PCI
        select PINCTRL_AT91
        select SOC_SAM_V4_V5
        select SRAM if PM