diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-27 18:26:35 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-29 15:42:38 -0400 |
| commit | 08d38bebb4dcd6414944f8277ea5ea30010664fe (patch) | |
| tree | 3b61e0257922e992c4f4bcf6ad3c3297882974af /arch/arm/mach-imx | |
| parent | a52d35c92d5d3b8890068860838541f7ad55cd29 (diff) | |
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')
| -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 5740296dc429..50bb546b893a 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -796,7 +796,6 @@ config SOC_IMX6Q | |||
| 796 | select ARM_ERRATA_764369 if SMP | 796 | select ARM_ERRATA_764369 if SMP |
| 797 | select HAVE_ARM_SCU if SMP | 797 | select HAVE_ARM_SCU if SMP |
| 798 | select HAVE_ARM_TWD if SMP | 798 | select HAVE_ARM_TWD if SMP |
| 799 | select MIGHT_HAVE_PCI | ||
| 800 | select PCI_DOMAINS if PCI | 799 | select PCI_DOMAINS if PCI |
| 801 | select PINCTRL_IMX6Q | 800 | select PINCTRL_IMX6Q |
| 802 | select SOC_IMX6 | 801 | select SOC_IMX6 |