summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2016-09-14 12:19:05 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-21 22:45:05 +0200
commit6016b23bd553f60cfb2fd9023fe8da4c116d9572 (patch)
treec6a16923fbd7b738ef68e67ac67806ac448ad7a9 /arch/arm/mach-integrator
parentMerge tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-6016b23bd553f60cfb2fd9023fe8da4c116d9572.tar.xz
linux-6016b23bd553f60cfb2fd9023fe8da4c116d9572.zip
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>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/Kconfig1
1 files changed, 0 insertions, 1 deletions
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
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