diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2016-09-14 06:19:05 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-21 16:45:05 -0400 |
| commit | 6016b23bd553f60cfb2fd9023fe8da4c116d9572 (patch) | |
| tree | c6a16923fbd7b738ef68e67ac67806ac448ad7a9 | |
| parent | 90793df938f11e676880338b94feb4d45cc3701e (diff) | |
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 <kishon@ti.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-axxia/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-spear/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/Kconfig | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 5204395efda8..841e924143f9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -55,7 +55,6 @@ config SOC_AT91RM9200 | |||
| 55 | select ATMEL_ST | 55 | select ATMEL_ST |
| 56 | select CPU_ARM920T | 56 | select CPU_ARM920T |
| 57 | select HAVE_AT91_USB_CLK | 57 | select HAVE_AT91_USB_CLK |
| 58 | select MIGHT_HAVE_PCI | ||
| 59 | select PINCTRL_AT91 | 58 | select PINCTRL_AT91 |
| 60 | select SOC_SAM_V4_V5 | 59 | select SOC_SAM_V4_V5 |
| 61 | select SRAM if PM | 60 | select SRAM if PM |
diff --git a/arch/arm/mach-axxia/Kconfig b/arch/arm/mach-axxia/Kconfig index 6c6d5e76565b..ee2e1314f8cf 100644 --- a/arch/arm/mach-axxia/Kconfig +++ b/arch/arm/mach-axxia/Kconfig | |||
| @@ -7,7 +7,6 @@ config ARCH_AXXIA | |||
| 7 | select ARM_TIMER_SP804 | 7 | select ARM_TIMER_SP804 |
| 8 | select HAVE_ARM_ARCH_TIMER | 8 | select HAVE_ARM_ARCH_TIMER |
| 9 | select MFD_SYSCON | 9 | select MFD_SYSCON |
| 10 | select MIGHT_HAVE_PCI | ||
| 11 | select PCI_DOMAINS if PCI | 10 | select PCI_DOMAINS if PCI |
| 12 | select ZONE_DMA | 11 | select ZONE_DMA |
| 13 | help | 12 | help |
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 8f820de890b4..ee8a99ca4ba9 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -126,7 +126,6 @@ config SOC_EXYNOS5440 | |||
| 126 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE | 126 | select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE |
| 127 | select HAVE_ARM_ARCH_TIMER | 127 | select HAVE_ARM_ARCH_TIMER |
| 128 | select AUTO_ZRELADDR | 128 | select AUTO_ZRELADDR |
| 129 | select MIGHT_HAVE_PCI | ||
| 130 | select PCI_DOMAINS if PCI | 129 | select PCI_DOMAINS if PCI |
| 131 | select PINCTRL_EXYNOS5440 | 130 | select PINCTRL_EXYNOS5440 |
| 132 | select PM_OPP | 131 | select PM_OPP |
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 599f973e10d8..cefe44f6889b 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig | |||
| @@ -21,7 +21,6 @@ if ARCH_INTEGRATOR | |||
| 21 | config ARCH_INTEGRATOR_AP | 21 | config ARCH_INTEGRATOR_AP |
| 22 | bool "Support Integrator/AP and Integrator/PP2 platforms" | 22 | bool "Support Integrator/AP and Integrator/PP2 platforms" |
| 23 | select INTEGRATOR_AP_TIMER | 23 | select INTEGRATOR_AP_TIMER |
| 24 | select MIGHT_HAVE_PCI | ||
| 25 | select SERIAL_AMBA_PL010 if TTY | 24 | select SERIAL_AMBA_PL010 if TTY |
| 26 | select SERIAL_AMBA_PL010_CONSOLE if TTY | 25 | select SERIAL_AMBA_PL010_CONSOLE if TTY |
| 27 | select SOC_BUS | 26 | select SOC_BUS |
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index 8ff61be1a29f..1507287eafdb 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig | |||
| @@ -8,7 +8,6 @@ config ARCH_KEYSTONE | |||
| 8 | select COMMON_CLK_KEYSTONE | 8 | select COMMON_CLK_KEYSTONE |
| 9 | select ARCH_SUPPORTS_BIG_ENDIAN | 9 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 10 | select ZONE_DMA if ARM_LPAE | 10 | select ZONE_DMA if ARM_LPAE |
| 11 | select MIGHT_HAVE_PCI | ||
| 12 | select PCI_DOMAINS if PCI | 11 | select PCI_DOMAINS if PCI |
| 13 | select PINCTRL | 12 | select PINCTRL |
| 14 | help | 13 | help |
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig index b7260c2b510c..1b6cae5e78f4 100644 --- a/arch/arm/mach-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig | |||
| @@ -20,7 +20,6 @@ config ARCH_SPEAR13XX | |||
| 20 | select HAVE_ARM_TWD if SMP | 20 | select HAVE_ARM_TWD if SMP |
| 21 | select PINCTRL | 21 | select PINCTRL |
| 22 | select MFD_SYSCON | 22 | select MFD_SYSCON |
| 23 | select MIGHT_HAVE_PCI | ||
| 24 | help | 23 | help |
| 25 | Supports for ARM's SPEAR13XX family | 24 | Supports for ARM's SPEAR13XX family |
| 26 | 25 | ||
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index b0cc26284fc9..c257d40ca51d 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig | |||
| @@ -9,7 +9,6 @@ config ARCH_VERSATILE | |||
| 9 | select CPU_ARM926T | 9 | select CPU_ARM926T |
| 10 | select ICST | 10 | select ICST |
| 11 | select MFD_SYSCON | 11 | select MFD_SYSCON |
| 12 | select MIGHT_HAVE_PCI | ||
| 13 | select PLAT_VERSATILE | 12 | select PLAT_VERSATILE |
| 14 | select POWER_RESET | 13 | select POWER_RESET |
| 15 | select POWER_RESET_VERSATILE | 14 | select POWER_RESET_VERSATILE |