ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM
authorWill Deacon <will.deacon@arm.com>
Tue, 27 May 2014 22:26:35 +0000 (23:26 +0100)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:24:03 +0000 (09:24 +0900)
commit29d1b99651a5c906d93efb6ca91e6c1224f780f5
treea43bc7978d0091bb06a26ac40ff56a67fa2c3242
parent69a15699f2caa8da16fb6ab24061ef9251a12161
ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM

When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
PCI-capable devices (e.g. mach-virt with virtio-pci).

This patch allows PCI support to be selected for these SoCs by selecting
CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y and removes the
individual selections from multi-platform enabled SoCs.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
(cherry picked from commit 08d38bebb4dcd6414944f8277ea5ea30010664fe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-bcm/Kconfig
arch/arm/mach-cns3xxx/Kconfig
arch/arm/mach-imx/Kconfig
arch/arm/Kconfig
arch/arm/mach-cns3xxx/Kconfig
arch/arm/mach-imx/Kconfig
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-tegra/Kconfig