ARM: stop *MIGHT_HAVE_PCI* config from being selected redundantly

*MIGHT_HAVE_PCI* config is already selected in ARCH_MULTIPLATFORM.
Don't select it redundantly in all ARCH_MULTIPLATFORM based machines.

Signed-off-by: Kishon Vijay Abraham I <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 5204395efda8d59db48e49d63d6a2c812687e4b2..841e924143f90e089bae9269acacdff65ab597f9 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -55,7 +55,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

diff --git a/arch/arm/mach-axxia/Kconfig b/arch/arm/mach-axxia/Kconfig
index 6c6d5e76565b71afc0d7b7a0e21e86da2188fec1..ee2e1314f8cfff8309b3c989a2a5a3c590cd014e 100644 (file)
--- a/arch/arm/mach-axxia/Kconfig
+++ b/arch/arm/mach-axxia/Kconfig
@@ -7,7 +7,6 @@ config ARCH_AXXIA
        select ARM_TIMER_SP804
        select HAVE_ARM_ARCH_TIMER
        select MFD_SYSCON
-       select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        select ZONE_DMA
        help

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 8f820de890b43559e55e475a9b51f8975f32e346..ee8a99ca4ba9621b62b4f8ce38b7f776026c8eb0 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -126,7 +126,6 @@ config SOC_EXYNOS5440
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
        select HAVE_ARM_ARCH_TIMER
        select AUTO_ZRELADDR
-       select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        select PINCTRL_EXYNOS5440
        select PM_OPP

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 599f973e10d83b0cb0e9047c9c2ecbb1ada5c2cf..cefe44f6889bd2a35baeecfc2303ab1aac6e1d42 100644 (file)
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -21,7 +21,6 @@ if ARCH_INTEGRATOR
 config ARCH_INTEGRATOR_AP
        bool "Support Integrator/AP and Integrator/PP2 platforms"
        select INTEGRATOR_AP_TIMER
-       select MIGHT_HAVE_PCI
        select SERIAL_AMBA_PL010 if TTY
        select SERIAL_AMBA_PL010_CONSOLE if TTY
        select SOC_BUS

diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 8ff61be1a29fb93f30f986d09ecbbcfdeca33a46..1507287eafdba05be823c3f49817cbb73b6774b2 100644 (file)
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -8,7 +8,6 @@ config ARCH_KEYSTONE
        select COMMON_CLK_KEYSTONE
        select ARCH_SUPPORTS_BIG_ENDIAN
        select ZONE_DMA if ARM_LPAE
-       select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        select PINCTRL
        help

diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index b7260c2b510c2dddac54bd9c57c9ceb8f7578154..1b6cae5e78f4cb7144811b4e05f3a0a237aabd60 100644 (file)
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -20,7 +20,6 @@ config ARCH_SPEAR13XX
        select HAVE_ARM_TWD if SMP
        select PINCTRL
        select MFD_SYSCON
-       select MIGHT_HAVE_PCI
        help
          Supports for ARM's SPEAR13XX family
 

diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index b0cc26284fc972bfea0433f5a66a45312e352013..c257d40ca51df3f96d65167212019c55302d1fdd 100644 (file)
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -9,7 +9,6 @@ config ARCH_VERSATILE
        select CPU_ARM926T
        select ICST
        select MFD_SYSCON
-       select MIGHT_HAVE_PCI
        select PLAT_VERSATILE
        select POWER_RESET
        select POWER_RESET_VERSATILE