Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[deliverable/linux.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 15df34fbdf44c5abd4182f1c5a0514162e7fe635..8973fae25436b1fcd5424dd5c7ed994ae68ed43a 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -2,7 +2,7 @@ menuconfig ARCH_MXC
        bool "Freescale i.MX family"
        depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
        select ARCH_REQUIRE_GPIOLIB
-       select ARM_CPU_SUSPEND if PM
+       select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_IMX_GPT
        select GENERIC_IRQ_CHIP
        select PINCTRL
@@ -511,6 +511,7 @@ config      SOC_IMX53
 
 config SOC_IMX6
        bool
+       select ARM_CPU_SUSPEND if PM
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
        select ARM_GIC
@@ -561,6 +562,7 @@ config SOC_IMX7D
        bool "i.MX7 Dual support"
        select PINCTRL_IMX7D
        select ARM_GIC
+       select HAVE_ARM_ARCH_TIMER
        select HAVE_IMX_ANATOP
        select HAVE_IMX_MMDC
        select HAVE_IMX_SRC