Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

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

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 9da3284..9155b63 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -81,7 +81,6 @@ config SOC_IMX31
        bool
        select CPU_V6
        select MXC_AVIC
-       select SMP_ON_UP if SMP
 
 config SOC_IMX35
        bool
@@ -89,7 +88,6 @@ config SOC_IMX35
        select HAVE_EPIT
        select MXC_AVIC
        select PINCTRL_IMX35
-       select SMP_ON_UP if SMP
 
 if ARCH_MULTI_V5
 
@@ -500,7 +498,6 @@ config SOC_IMX6Q
        select ARM_ERRATA_764369 if SMP
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD
-       select PCI_DOMAINS if PCI
        select PINCTRL_IMX6Q
        select SOC_IMX6
 
@@ -546,7 +543,6 @@ config SOC_LS1021A
        bool "Freescale LS1021A support"
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
-       select PCI_DOMAINS if PCI
        select ZONE_DMA if ARM_LPAE
        help
          This enables support for Freescale LS1021A processor.
@@ -562,7 +558,6 @@ config SOC_VF610
        select ARM_GIC if ARCH_MULTI_V7
        select PINCTRL_VF610
        select PL310_ERRATA_769419 if CACHE_L2X0
-       select SMP_ON_UP if SMP
 
        help
          This enables support for Freescale Vybrid VF610 processor.