Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index dd905b9602a02d53ebe86764aaf00dbbc4dbe1da..ee9a318cab31898832710927213ccc363f020e49 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,10 +1,10 @@
 menuconfig ARCH_MXC
        bool "Freescale i.MX family"
        depends on ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
 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 ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_IMX_GPT
        select GENERIC_IRQ_CHIP
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_IMX_GPT
        select GENERIC_IRQ_CHIP

+       select GPIOLIB

        select PINCTRL
        select PM_OPP if PM
        select SOC_BUS
        select PINCTRL
        select PM_OPP if PM
        select SOC_BUS


@@ -44,9 +44,6 @@ config MXC_USE_EPIT
          uses the same clocks as the GPT. Anyway, on some systems the GPT
          may be in use for other purposes.
 
          uses the same clocks as the GPT. Anyway, on some systems the GPT
          may be in use for other purposes.
 

-config ARCH_HAS_RNGA
-       bool
-

 config HAVE_IMX_ANATOP
        bool
 
 config HAVE_IMX_ANATOP
        bool
 


@@ -90,7 +87,6 @@ config SOC_IMX27
 config SOC_IMX31
        bool
        select CPU_V6
 config SOC_IMX31
        bool
        select CPU_V6

-       select IMX_HAVE_PLATFORM_MXC_RNGA

        select MXC_AVIC
        select SMP_ON_UP if SMP
 
        select MXC_AVIC
        select SMP_ON_UP if SMP