diff options
author | Will Deacon <will.deacon@arm.com> | 2014-05-27 23:26:35 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-29 12:42:38 -0700 |
commit | 08d38bebb4dcd6414944f8277ea5ea30010664fe (patch) | |
tree | 3b61e0257922e992c4f4bcf6ad3c3297882974af /arch/arm/mach-imx/Kconfig | |
parent | a52d35c92d5d3b8890068860838541f7ad55cd29 (diff) | |
download | op-kernel-dev-08d38bebb4dcd6414944f8277ea5ea30010664fe.zip op-kernel-dev-08d38bebb4dcd6414944f8277ea5ea30010664fe.tar.gz |
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>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 5740296d..50bb546 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -796,7 +796,6 @@ config SOC_IMX6Q select ARM_ERRATA_764369 if SMP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI select PINCTRL_IMX6Q select SOC_IMX6 |