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-bcm | |
| 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-bcm')
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index b8cc9e8992f1..2113d92c668a 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig | |||
| @@ -77,7 +77,6 @@ config ARCH_BCM_5301X | |||
| 77 | select HAVE_ARM_TWD if SMP | 77 | select HAVE_ARM_TWD if SMP |
| 78 | select ARM_GLOBAL_TIMER | 78 | select ARM_GLOBAL_TIMER |
| 79 | select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK | 79 | select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK |
| 80 | select MIGHT_HAVE_PCI | ||
| 81 | help | 80 | help |
| 82 | Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. | 81 | Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. |
| 83 | 82 | ||